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

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

Issue 6913026: Compact Navigation prototype (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Clang build fix. After commit/revert. Created 9 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 72
73 // Returns true if the app menu is focused. 73 // Returns true if the app menu is focused.
74 bool IsAppMenuFocused(); 74 bool IsAppMenuFocused();
75 75
76 // Add a listener to receive a callback when the menu opens. 76 // Add a listener to receive a callback when the menu opens.
77 void AddMenuListener(views::MenuListener* listener); 77 void AddMenuListener(views::MenuListener* listener);
78 78
79 // Remove a menu listener. 79 // Remove a menu listener.
80 void RemoveMenuListener(views::MenuListener* listener); 80 void RemoveMenuListener(views::MenuListener* listener);
81 81
82 // Gets a bitmap with the icon for the app menu and any overlaid notification
83 // badge.
84 SkBitmap GetAppMenuIcon(views::CustomButton::ButtonState state);
85
82 virtual bool GetAcceleratorInfo(int id, ui::Accelerator* accel); 86 virtual bool GetAcceleratorInfo(int id, ui::Accelerator* accel);
83 87
84 // Accessors... 88 // Accessors...
85 Browser* browser() const { return browser_; } 89 Browser* browser() const { return browser_; }
86 BrowserActionsContainer* browser_actions() const { return browser_actions_; } 90 BrowserActionsContainer* browser_actions() const { return browser_actions_; }
87 ReloadButton* reload_button() const { return reload_; } 91 ReloadButton* reload_button() const { return reload_; }
88 LocationBarView* location_bar() const { return location_bar_; } 92 LocationBarView* location_bar() const { return location_bar_; }
89 views::MenuButton* app_menu() const { return app_menu_; } 93 views::MenuButton* app_menu() const { return app_menu_; }
90 94
91 // Overridden from AccessiblePaneView 95 // Overridden from AccessiblePaneView
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 DISPLAYMODE_LOCATION // Slimline toolbar showing only compact location 167 DISPLAYMODE_LOCATION // Slimline toolbar showing only compact location
164 // bar, used for popups. 168 // bar, used for popups.
165 }; 169 };
166 bool IsDisplayModeNormal() const { 170 bool IsDisplayModeNormal() const {
167 return display_mode_ == DISPLAYMODE_NORMAL; 171 return display_mode_ == DISPLAYMODE_NORMAL;
168 } 172 }
169 173
170 // Updates the badge on the app menu (Wrench). 174 // Updates the badge on the app menu (Wrench).
171 void UpdateAppMenuBadge(); 175 void UpdateAppMenuBadge();
172 176
173 // Gets a bitmap with the icon for the app menu and any overlaid notification
174 // badge.
175 SkBitmap GetAppMenuIcon(views::CustomButton::ButtonState state);
176
177 // Gets a badge for the wrench icon corresponding to the number of 177 // Gets a badge for the wrench icon corresponding to the number of
178 // unacknowledged background pages in the system. 178 // unacknowledged background pages in the system.
179 SkBitmap GetBackgroundPageBadge(); 179 SkBitmap GetBackgroundPageBadge();
180 180
181 scoped_ptr<BackForwardMenuModel> back_menu_model_; 181 scoped_ptr<BackForwardMenuModel> back_menu_model_;
182 scoped_ptr<BackForwardMenuModel> forward_menu_model_; 182 scoped_ptr<BackForwardMenuModel> forward_menu_model_;
183 183
184 // The model that contains the security level, text, icon to display... 184 // The model that contains the security level, text, icon to display...
185 ToolbarModel* model_; 185 ToolbarModel* model_;
186 186
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 223
224 // If non-null the destructor sets this to true. This is set to a non-null 224 // If non-null the destructor sets this to true. This is set to a non-null
225 // while the menu is showing and used to detect if the menu was deleted while 225 // while the menu is showing and used to detect if the menu was deleted while
226 // running. 226 // running.
227 bool* destroyed_flag_; 227 bool* destroyed_flag_;
228 228
229 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 229 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
230 }; 230 };
231 231
232 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 232 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip_controller.h ('k') | chrome/browser/ui/views/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698