Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Unified Diff: chrome/browser/ui/views/new_task_manager_view.h

Issue 1982303003: Reuse more dialog code for new task manager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: simpler Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/new_task_manager_view.h
diff --git a/chrome/browser/ui/views/new_task_manager_view.h b/chrome/browser/ui/views/new_task_manager_view.h
index f26bfe33973553641a025b6a0ba172fcee7bcf78..6076e5f48f0ac2d64496e6d54264bb2ce16ba25a 100644
--- a/chrome/browser/ui/views/new_task_manager_view.h
+++ b/chrome/browser/ui/views/new_task_manager_view.h
@@ -12,7 +12,6 @@
#include "ui/base/models/simple_menu_model.h"
#include "ui/base/models/table_model.h"
#include "ui/views/context_menu_controller.h"
-#include "ui/views/controls/button/label_button.h"
#include "ui/views/controls/menu/menu_runner.h"
#include "ui/views/controls/table/table_grouper.h"
#include "ui/views/controls/table/table_view_observer.h"
@@ -21,7 +20,6 @@
class Browser;
namespace views {
-class LabelButton;
class Link;
class TableView;
class View;
@@ -34,7 +32,6 @@ class TaskManagerTableModel;
// The new task manager UI container.
class NewTaskManagerView
: public TableViewDelegate,
- public views::ButtonListener,
public views::DialogDelegateView,
public views::TableGrouper,
public views::TableViewObserver,
@@ -57,14 +54,8 @@ class NewTaskManagerView
void ToggleSortOrder(int visible_column_index) override;
// views::View:
- void Layout() override;
gfx::Size GetPreferredSize() const override;
bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
- void ViewHierarchyChanged(
- const ViewHierarchyChangedDetails& details) override;
-
- // views::ButtonListener:
- void ButtonPressed(views::Button* sender, const ui::Event& event) override;
// views::DialogDelegateView:
bool CanResize() const override;
@@ -73,7 +64,11 @@ class NewTaskManagerView
bool ExecuteWindowsCommand(int command_id) override;
base::string16 GetWindowTitle() const override;
std::string GetWindowName() const override;
+ bool Accept() override;
+ bool Close() override;
int GetDialogButtons() const override;
+ base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
+ bool IsDialogButtonEnabled(ui::DialogButton button) const override;
void WindowClosing() override;
bool UseNewStyleForThisDialog() const override;
@@ -114,7 +109,7 @@ class NewTaskManagerView
void ActivateFocusedTab();
// Restores saved "always on top" state from a previous session.
- void RetriveSavedAlwaysOnTopState();
+ void RetrieveSavedAlwaysOnTopState();
std::unique_ptr<TaskManagerTableModel> table_model_;
@@ -123,7 +118,6 @@ class NewTaskManagerView
// We need to own the text of the menu, the Windows API does not copy it.
base::string16 always_on_top_menu_text_;
- views::LabelButton* kill_button_;
views::TableView* tab_table_;
views::View* tab_table_parent_;
« no previous file with comments | « no previous file | chrome/browser/ui/views/new_task_manager_view.cc » ('j') | chrome/browser/ui/views/new_task_manager_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698