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

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

Issue 550313002: Pop extensions out of the action overflow menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: name change + latest master for CQ Created 6 years, 3 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_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/extensions/extension_toolbar_model.h" 10 #include "chrome/browser/extensions/extension_toolbar_model.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 180
181 // Returns how many browser actions will be visible once the container 181 // Returns how many browser actions will be visible once the container
182 // finishes animating to a new size, or (if not animating) the currently 182 // finishes animating to a new size, or (if not animating) the currently
183 // visible icons. 183 // visible icons.
184 size_t VisibleBrowserActionsAfterAnimation() const; 184 size_t VisibleBrowserActionsAfterAnimation() const;
185 185
186 // Executes |command| registered by |extension|. 186 // Executes |command| registered by |extension|.
187 void ExecuteExtensionCommand(const extensions::Extension* extension, 187 void ExecuteExtensionCommand(const extensions::Extension* extension,
188 const extensions::Command& command); 188 const extensions::Command& command);
189 189
190 // Notify the browser action container that an extension has been moved to
191 // the overflow container.
192 void NotifyActionMovedToOverflow();
193
190 // Add or remove an observer. 194 // Add or remove an observer.
191 void AddObserver(BrowserActionsContainerObserver* observer); 195 void AddObserver(BrowserActionsContainerObserver* observer);
192 void RemoveObserver(BrowserActionsContainerObserver* observer); 196 void RemoveObserver(BrowserActionsContainerObserver* observer);
193 197
194 // Overridden from views::View: 198 // Overridden from views::View:
195 virtual gfx::Size GetPreferredSize() const OVERRIDE; 199 virtual gfx::Size GetPreferredSize() const OVERRIDE;
196 virtual gfx::Size GetMinimumSize() const OVERRIDE; 200 virtual gfx::Size GetMinimumSize() const OVERRIDE;
197 virtual void Layout() OVERRIDE; 201 virtual void Layout() OVERRIDE;
198 virtual bool GetDropFormats(int* formats, 202 virtual bool GetDropFormats(int* formats,
199 std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE; 203 std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 size_t GetFirstVisibleIconIndex() const; 350 size_t GetFirstVisibleIconIndex() const;
347 351
348 // Returns the number of icons that this container should draw. This differs 352 // Returns the number of icons that this container should draw. This differs
349 // from the model's GetVisibleIconCount if this container is for the overflow. 353 // from the model's GetVisibleIconCount if this container is for the overflow.
350 size_t GetIconCount() const; 354 size_t GetIconCount() const;
351 355
352 // Whether this container is in overflow mode (as opposed to in 'main' 356 // Whether this container is in overflow mode (as opposed to in 'main'
353 // mode). See class comments for details on the difference. 357 // mode). See class comments for details on the difference.
354 bool in_overflow_mode() const { return main_container_ != NULL; } 358 bool in_overflow_mode() const { return main_container_ != NULL; }
355 359
360 // Whether or not the container has been initialized.
361 bool initialized_;
362
356 // The vector of browser actions (icons/image buttons for each action). Note 363 // The vector of browser actions (icons/image buttons for each action). Note
357 // that not every BrowserAction in the ToolbarModel will necessarily be in 364 // that not every BrowserAction in the ToolbarModel will necessarily be in
358 // this collection. Some extensions may be disabled in incognito windows. 365 // this collection. Some extensions may be disabled in incognito windows.
359 BrowserActionViews browser_action_views_; 366 BrowserActionViews browser_action_views_;
360 367
361 Profile* profile_; 368 Profile* profile_;
362 369
363 // The Browser object the container is associated with. 370 // The Browser object the container is associated with.
364 Browser* browser_; 371 Browser* browser_;
365 372
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 426
420 // Handles delayed showing of the overflow menu when hovering. 427 // Handles delayed showing of the overflow menu when hovering.
421 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_; 428 base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;
422 429
423 ObserverList<BrowserActionsContainerObserver> observers_; 430 ObserverList<BrowserActionsContainerObserver> observers_;
424 431
425 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); 432 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
426 }; 433 };
427 434
428 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ 435 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698