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

Side by Side Diff: chrome/browser/ui/views/new_task_manager_view.h

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_NEW_TASK_MANAGER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_NEW_TASK_MANAGER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_NEW_TASK_MANAGER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_NEW_TASK_MANAGER_VIEW_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "chrome/browser/ui/host_desktop.h" 10 #include "chrome/browser/ui/host_desktop.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 bool IsCommandIdChecked(int id) const override; 119 bool IsCommandIdChecked(int id) const override;
120 bool IsCommandIdEnabled(int id) const override; 120 bool IsCommandIdEnabled(int id) const override;
121 bool GetAcceleratorForCommandId(int command_id, 121 bool GetAcceleratorForCommandId(int command_id,
122 ui::Accelerator* accelerator) override; 122 ui::Accelerator* accelerator) override;
123 void ExecuteCommand(int id, int event_flags) override; 123 void ExecuteCommand(int id, int event_flags) override;
124 124
125 private: 125 private:
126 friend class NewTaskManagerViewTest; 126 friend class NewTaskManagerViewTest;
127 class TableModel; 127 class TableModel;
128 128
129 explicit NewTaskManagerView(chrome::HostDesktopType desktop_type); 129 explicit NewTaskManagerView(ui::HostDesktopType desktop_type);
130 130
131 static NewTaskManagerView* GetInstanceForTests(); 131 static NewTaskManagerView* GetInstanceForTests();
132 132
133 // Creates the child controls. 133 // Creates the child controls.
134 void Init(); 134 void Init();
135 135
136 // Initializes the state of the always-on-top setting as the window is shown. 136 // Initializes the state of the always-on-top setting as the window is shown.
137 void InitAlwaysOnTopState(); 137 void InitAlwaysOnTopState();
138 138
139 // Activates the tab associated with the focused row. 139 // Activates the tab associated with the focused row.
(...skipping 27 matching lines...) Expand all
167 167
168 views::LabelButton* kill_button_; 168 views::LabelButton* kill_button_;
169 views::Link* about_memory_link_; 169 views::Link* about_memory_link_;
170 views::TableView* tab_table_; 170 views::TableView* tab_table_;
171 views::View* tab_table_parent_; 171 views::View* tab_table_parent_;
172 172
173 // all possible columns, not necessarily visible 173 // all possible columns, not necessarily visible
174 std::vector<ui::TableColumn> columns_; 174 std::vector<ui::TableColumn> columns_;
175 175
176 // The host desktop type this task manager belongs to. 176 // The host desktop type this task manager belongs to.
177 const chrome::HostDesktopType desktop_type_; 177 const ui::HostDesktopType desktop_type_;
178 178
179 // True when the Task Manager window should be shown on top of other windows. 179 // True when the Task Manager window should be shown on top of other windows.
180 bool is_always_on_top_; 180 bool is_always_on_top_;
181 181
182 DISALLOW_COPY_AND_ASSIGN(NewTaskManagerView); 182 DISALLOW_COPY_AND_ASSIGN(NewTaskManagerView);
183 }; 183 };
184 184
185 } // namespace task_management 185 } // namespace task_management
186 186
187 #endif // CHROME_BROWSER_UI_VIEWS_NEW_TASK_MANAGER_VIEW_H_ 187 #endif // CHROME_BROWSER_UI_VIEWS_NEW_TASK_MANAGER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698