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

Side by Side Diff: chrome/browser/ui/views/toolbar/toolbar_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_TOOLBAR_TOOLBAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 // views::ButtonListener: 130 // views::ButtonListener:
131 void ButtonPressed(views::Button* sender, const ui::Event& event) override; 131 void ButtonPressed(views::Button* sender, const ui::Event& event) override;
132 132
133 // content::NotificationObserver: 133 // content::NotificationObserver:
134 void Observe(int type, 134 void Observe(int type,
135 const content::NotificationSource& source, 135 const content::NotificationSource& source,
136 const content::NotificationDetails& details) override; 136 const content::NotificationDetails& details) override;
137 137
138 // ui::AcceleratorProvider: 138 // ui::AcceleratorProvider:
139 bool GetAcceleratorForCommandId(int command_id, 139 bool GetAcceleratorForCommandId(int command_id,
140 ui::Accelerator* accelerator) override; 140 ui::Accelerator* accelerator) const override;
141 141
142 // views::View: 142 // views::View:
143 gfx::Size GetPreferredSize() const override; 143 gfx::Size GetPreferredSize() const override;
144 gfx::Size GetMinimumSize() const override; 144 gfx::Size GetMinimumSize() const override;
145 void Layout() override; 145 void Layout() override;
146 void OnThemeChanged() override; 146 void OnThemeChanged() override;
147 const char* GetClassName() const override; 147 const char* GetClassName() const override;
148 bool AcceleratorPressed(const ui::Accelerator& acc) override; 148 bool AcceleratorPressed(const ui::Accelerator& acc) override;
149 149
150 protected: 150 protected:
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 215
216 // The display mode used when laying out the toolbar. 216 // The display mode used when laying out the toolbar.
217 const DisplayMode display_mode_; 217 const DisplayMode display_mode_;
218 218
219 content::NotificationRegistrar registrar_; 219 content::NotificationRegistrar registrar_;
220 220
221 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 221 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
222 }; 222 };
223 223
224 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ 224 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/reload_button.cc ('k') | chrome/browser/ui/views/toolbar/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698