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

Side by Side Diff: chrome/browser/ui/views/toolbar/toolbar_view.h

Issue 1469423002: Modify toolbar action bar layout for material design (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more comments addressed Created 5 years 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 "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/observer_list.h" 9 #include "base/observer_list.h"
10 #include "base/prefs/pref_member.h" 10 #include "base/prefs/pref_member.h"
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 ui::Accelerator* accelerator) override; 141 ui::Accelerator* accelerator) override;
142 142
143 // views::View: 143 // views::View:
144 gfx::Size GetPreferredSize() const override; 144 gfx::Size GetPreferredSize() const override;
145 gfx::Size GetMinimumSize() const override; 145 gfx::Size GetMinimumSize() const override;
146 void Layout() override; 146 void Layout() override;
147 void OnThemeChanged() override; 147 void OnThemeChanged() override;
148 const char* GetClassName() const override; 148 const char* GetClassName() const override;
149 bool AcceleratorPressed(const ui::Accelerator& acc) override; 149 bool AcceleratorPressed(const ui::Accelerator& acc) override;
150 150
151 enum {
152 // The apparent horizontal space between most items, and the vertical
153 // padding above and below them.
154 kStandardSpacing = 3,
155 };
156
157 protected: 151 protected:
158 // AccessiblePaneView: 152 // AccessiblePaneView:
159 bool SetPaneFocusAndFocusDefault() override; 153 bool SetPaneFocusAndFocusDefault() override;
160 void RemovePaneFocus() override; 154 void RemovePaneFocus() override;
161 155
162 private: 156 private:
163 // Types of display mode this toolbar can have. 157 // Types of display mode this toolbar can have.
164 enum DisplayMode { 158 enum DisplayMode {
165 DISPLAYMODE_NORMAL, // Normal toolbar with buttons, etc. 159 DISPLAYMODE_NORMAL, // Normal toolbar with buttons, etc.
166 DISPLAYMODE_LOCATION // Slimline toolbar showing only compact location 160 DISPLAYMODE_LOCATION // Slimline toolbar showing only compact location
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 211
218 // The display mode used when laying out the toolbar. 212 // The display mode used when laying out the toolbar.
219 DisplayMode display_mode_; 213 DisplayMode display_mode_;
220 214
221 content::NotificationRegistrar registrar_; 215 content::NotificationRegistrar registrar_;
222 216
223 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 217 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
224 }; 218 };
225 219
226 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_ 220 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/browser_actions_container.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