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

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

Issue 2389803006: Revert of Fix task manager's default sizing. (Closed)
Patch Set: Created 4 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/task_manager_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_TASK_MANAGER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TASK_MANAGER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_TASK_MANAGER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TASK_MANAGER_VIEW_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 void SelectTaskOfActiveTab(Browser* browser); 108 void SelectTaskOfActiveTab(Browser* browser);
109 109
110 // Restores saved "always on top" state from a previous session. 110 // Restores saved "always on top" state from a previous session.
111 void RetrieveSavedAlwaysOnTopState(); 111 void RetrieveSavedAlwaysOnTopState();
112 112
113 std::unique_ptr<TaskManagerTableModel> table_model_; 113 std::unique_ptr<TaskManagerTableModel> table_model_;
114 114
115 std::unique_ptr<ui::SimpleMenuModel> menu_model_; 115 std::unique_ptr<ui::SimpleMenuModel> menu_model_;
116 std::unique_ptr<views::MenuRunner> menu_runner_; 116 std::unique_ptr<views::MenuRunner> menu_runner_;
117 117
118 // We need to own the text of the menu, the Windows API does not copy it.
119 base::string16 always_on_top_menu_text_;
120
118 views::TableView* tab_table_; 121 views::TableView* tab_table_;
119 views::View* tab_table_parent_; 122 views::View* tab_table_parent_;
120 123
121 // all possible columns, not necessarily visible 124 // all possible columns, not necessarily visible
122 std::vector<ui::TableColumn> columns_; 125 std::vector<ui::TableColumn> columns_;
123 126
124 // True when the Task Manager window should be shown on top of other windows. 127 // True when the Task Manager window should be shown on top of other windows.
125 bool is_always_on_top_; 128 bool is_always_on_top_;
126 129
127 DISALLOW_COPY_AND_ASSIGN(TaskManagerView); 130 DISALLOW_COPY_AND_ASSIGN(TaskManagerView);
128 }; 131 };
129 132
130 } // namespace task_manager 133 } // namespace task_manager
131 134
132 #endif // CHROME_BROWSER_UI_VIEWS_TASK_MANAGER_VIEW_H_ 135 #endif // CHROME_BROWSER_UI_VIEWS_TASK_MANAGER_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/task_manager_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698