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

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

Issue 726813002: [Extensions Toolbar] Make the ExtensionToolbarModel icon count more stable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Peter's Created 6 years, 1 month 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_BROWSER_ACTIONS_CONTAINER_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
7 7
8 #include "base/observer_list.h" 8 #include "base/observer_list.h"
9 #include "chrome/browser/extensions/extension_keybinding_registry.h" 9 #include "chrome/browser/extensions/extension_keybinding_registry.h"
10 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" 10 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 // Whether this container is in overflow mode (as opposed to in 'main' 282 // Whether this container is in overflow mode (as opposed to in 'main'
283 // mode). See class comments for details on the difference. 283 // mode). See class comments for details on the difference.
284 bool in_overflow_mode() const { return main_container_ != NULL; } 284 bool in_overflow_mode() const { return main_container_ != NULL; }
285 285
286 // The controlling ToolbarActionsBar, which handles most non-view logic. 286 // The controlling ToolbarActionsBar, which handles most non-view logic.
287 scoped_ptr<ToolbarActionsBar> toolbar_actions_bar_; 287 scoped_ptr<ToolbarActionsBar> toolbar_actions_bar_;
288 288
289 // The vector of toolbar actions (icons/image buttons for each action). 289 // The vector of toolbar actions (icons/image buttons for each action).
290 ToolbarActionViews toolbar_action_views_; 290 ToolbarActionViews toolbar_action_views_;
291 291
292 // Whether or not the container has been initialized.
293 bool initialized_;
294
295 // The Browser object the container is associated with. 292 // The Browser object the container is associated with.
296 Browser* browser_; 293 Browser* browser_;
297 294
298 // The main container we are serving as overflow for, or NULL if this 295 // The main container we are serving as overflow for, or NULL if this
299 // class is the the main container. See class comments for details on 296 // class is the the main container. See class comments for details on
300 // the difference between main and overflow. 297 // the difference between main and overflow.
301 BrowserActionsContainer* main_container_; 298 BrowserActionsContainer* main_container_;
302 299
303 // The view that triggered the current popup (just a reference to a view 300 // The view that triggered the current popup (just a reference to a view
304 // from toolbar_action_views_). 301 // from toolbar_action_views_).
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 335
339 // The class that registers for keyboard shortcuts for extension commands. 336 // The class that registers for keyboard shortcuts for extension commands.
340 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_; 337 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_;
341 338
342 ObserverList<BrowserActionsContainerObserver> observers_; 339 ObserverList<BrowserActionsContainerObserver> observers_;
343 340
344 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); 341 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
345 }; 342 };
346 343
347 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ 344 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_actions_bar.cc ('k') | chrome/browser/ui/views/toolbar/browser_actions_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698