Chromium Code Reviews| Index: chrome/browser/ui/views/toolbar/browser_actions_container.h |
| diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.h b/chrome/browser/ui/views/toolbar/browser_actions_container.h |
| index 5c0d8a5351096c4fc49b03f626e1eb421dfae818..ebe8eb6e60f2a909cde54801f853535670cbf535 100644 |
| --- a/chrome/browser/ui/views/toolbar/browser_actions_container.h |
| +++ b/chrome/browser/ui/views/toolbar/browser_actions_container.h |
| @@ -235,7 +235,7 @@ class BrowserActionsContainer |
| void AnimationEnded(const gfx::Animation* animation) override; |
| // Overridden from BrowserActionView::Delegate: |
| - content::WebContents* GetCurrentWebContents() override; |
| + content::WebContents* GetCurrentWebContents() const override; |
| bool ShownInsideMenu() const override; |
| void OnBrowserActionViewDragDone() override; |
| views::MenuButton* GetOverflowReferenceView() override; |
| @@ -285,6 +285,7 @@ class BrowserActionsContainer |
| bool grant_active_tab) override; |
| void ToolbarVisibleCountChanged() override; |
| void ToolbarHighlightModeChanged(bool is_highlighting) override; |
| + void ToolbarReorderNecessary(content::WebContents* web_contents) override; |
| Browser* GetBrowser() override; |
| void LoadImages(); |
| @@ -323,6 +324,9 @@ class BrowserActionsContainer |
| // the target size). |
| void Animate(gfx::Tween::Type type, size_t num_visible_icons); |
| + // Reorder the views to match the toolbar model for the active tab. |
|
Peter Kasting
2014/10/30 22:06:00
Nit: "Reorders"
Devlin
2014/10/31 17:44:09
Done.
|
| + void ReorderViews(); |
| + |
| // Returns the number of icons that this container should draw. This differs |
| // from the model's GetVisibleIconCount if this container is for the overflow. |
| size_t GetIconCount() const; |
| @@ -375,6 +379,13 @@ class BrowserActionsContainer |
| // Don't show the chevron while animating. |
| bool suppress_chevron_; |
| + // True if we should suppress animation. |
|
Peter Kasting
2014/10/30 22:06:00
Nit: Does this need a note about when/why we might
Devlin
2014/10/31 17:44:09
Done.
|
| + bool suppress_animation_; |
| + |
| + // True if we should suppress layout, such as when we are creating or |
| + // adjusting a lot of views. |
| + bool suppress_layout_; |
| + |
| // This is used while the user is resizing (and when the animations are in |
| // progress) to know how wide the delta is between the current state and what |
| // we should draw. |