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

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

Issue 2133013002: AcceleratorProvider: Make GetAcceleratorForCommandId const. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix overrides on Mac and Chrome OS. Created 4 years, 5 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 "base/macros.h" 10 #include "base/macros.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 // views::ContextMenuController: 83 // views::ContextMenuController:
84 void ShowContextMenuForView(views::View* source, 84 void ShowContextMenuForView(views::View* source,
85 const gfx::Point& point, 85 const gfx::Point& point,
86 ui::MenuSourceType source_type) override; 86 ui::MenuSourceType source_type) override;
87 87
88 // ui::SimpleMenuModel::Delegate: 88 // ui::SimpleMenuModel::Delegate:
89 bool IsCommandIdChecked(int id) const override; 89 bool IsCommandIdChecked(int id) const override;
90 bool IsCommandIdEnabled(int id) const override; 90 bool IsCommandIdEnabled(int id) const override;
91 bool GetAcceleratorForCommandId(int command_id, 91 bool GetAcceleratorForCommandId(int command_id,
92 ui::Accelerator* accelerator) override; 92 ui::Accelerator* accelerator) const override;
93 void ExecuteCommand(int id, int event_flags) override; 93 void ExecuteCommand(int id, int event_flags) override;
94 94
95 private: 95 private:
96 friend class NewTaskManagerViewTest; 96 friend class NewTaskManagerViewTest;
97 97
98 NewTaskManagerView(); 98 NewTaskManagerView();
99 99
100 static NewTaskManagerView* GetInstanceForTests(); 100 static NewTaskManagerView* GetInstanceForTests();
101 101
102 // Creates the child controls. 102 // Creates the child controls.
(...skipping 23 matching lines...) Expand all
126 126
127 // 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.
128 bool is_always_on_top_; 128 bool is_always_on_top_;
129 129
130 DISALLOW_COPY_AND_ASSIGN(NewTaskManagerView); 130 DISALLOW_COPY_AND_ASSIGN(NewTaskManagerView);
131 }; 131 };
132 132
133 } // namespace task_management 133 } // namespace task_management
134 134
135 #endif // CHROME_BROWSER_UI_VIEWS_NEW_TASK_MANAGER_VIEW_H_ 135 #endif // CHROME_BROWSER_UI_VIEWS_NEW_TASK_MANAGER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/system_menu_model_delegate.cc ('k') | chrome/browser/ui/views/new_task_manager_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698