| Index: chrome/browser/ui/toolbar/toolbar_actions_bar.h
|
| diff --git a/chrome/browser/ui/toolbar/toolbar_actions_bar.h b/chrome/browser/ui/toolbar/toolbar_actions_bar.h
|
| index ddba8259bb3dcd4e02dcc8e51dabc275b6e5ec2b..1c04daed7bd1057d8a40fa6023fbd88284080efb 100644
|
| --- a/chrome/browser/ui/toolbar/toolbar_actions_bar.h
|
| +++ b/chrome/browser/ui/toolbar/toolbar_actions_bar.h
|
| @@ -186,8 +186,11 @@ class ToolbarActionsBar : public ToolbarActionsModel::Observer {
|
| const;
|
|
|
| // Pops out a given |action|, ensuring it is visible.
|
| + // |is_sticky| refers to whether or not the action will stay popped out if
|
| + // the overflow menu is opened.
|
| // |closure| will be called once any animation is complete.
|
| void PopOutAction(ToolbarActionViewController* action,
|
| + bool is_sticky,
|
| const base::Closure& closure);
|
|
|
| // Undoes the current "pop out"; i.e., moves the popped out action back into
|
| @@ -325,6 +328,10 @@ class ToolbarActionsBar : public ToolbarActionsModel::Observer {
|
| // order to show a popup.
|
| ToolbarActionViewController* popped_out_action_;
|
|
|
| + // True if the popped out action is "sticky", meaning it will stay popped
|
| + // out even if another menu is opened.
|
| + bool is_popped_out_sticky_;
|
| +
|
| // The task to alert the |popped_out_action_| that animation has finished, and
|
| // it is fully popped out.
|
| base::Closure popped_out_closure_;
|
|
|