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

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

Issue 8201006: Views: Rebuild wrench menu if error is added or removed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: '' Created 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/views/toolbar_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 (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 10
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 192
193 // Contents of the profiles menu to populate with profile names. 193 // Contents of the profiles menu to populate with profile names.
194 scoped_ptr<ui::SimpleMenuModel> profiles_menu_contents_; 194 scoped_ptr<ui::SimpleMenuModel> profiles_menu_contents_;
195 195
196 // Controls whether or not a home button should be shown on the toolbar. 196 // Controls whether or not a home button should be shown on the toolbar.
197 BooleanPrefMember show_home_button_; 197 BooleanPrefMember show_home_button_;
198 198
199 // The display mode used when laying out the toolbar. 199 // The display mode used when laying out the toolbar.
200 DisplayMode display_mode_; 200 DisplayMode display_mode_;
201 201
202 // The contents of the wrench menu.
203 scoped_ptr<ui::SimpleMenuModel> wrench_menu_model_;
204
205 // Wrench menu. 202 // Wrench menu.
206 scoped_ptr<WrenchMenu> wrench_menu_; 203 scoped_ptr<WrenchMenu> wrench_menu_;
207 204
208 // A list of listeners to call when the menu opens. 205 // A list of listeners to call when the menu opens.
209 ObserverList<views::MenuListener> menu_listeners_; 206 ObserverList<views::MenuListener> menu_listeners_;
210 207
211 NotificationRegistrar registrar_; 208 NotificationRegistrar registrar_;
212 209
213 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 210 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
214 }; 211 };
215 212
216 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 213 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698