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

Side by Side Diff: chrome/browser/ui/toolbar/toolbar_actions_bar.h

Issue 1081113002: Revert of [Extensions] Make extension message bubble factory platform-abstract (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_ 5 #ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_
6 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_ 6 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/scoped_observer.h" 10 #include "base/scoped_observer.h"
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 content::WebContents* GetCurrentWebContents(); 191 content::WebContents* GetCurrentWebContents();
192 192
193 // Reorders the toolbar actions to reflect the model and, optionally, to 193 // Reorders the toolbar actions to reflect the model and, optionally, to
194 // "pop out" any overflowed actions that want to run (depending on the 194 // "pop out" any overflowed actions that want to run (depending on the
195 // value of |pop_out_actions_to_run|. 195 // value of |pop_out_actions_to_run|.
196 void ReorderActions(); 196 void ReorderActions();
197 197
198 // Sets |overflowed_action_wants_to_run_| to the proper value. 198 // Sets |overflowed_action_wants_to_run_| to the proper value.
199 void SetOverflowedActionWantsToRun(); 199 void SetOverflowedActionWantsToRun();
200 200
201 // Shows an extension message bubble, if any should be shown.
202 void MaybeShowExtensionBubble();
203
204 bool in_overflow_mode() const { return main_bar_ != nullptr; } 201 bool in_overflow_mode() const { return main_bar_ != nullptr; }
205 202
206 // The delegate for this object (in a real build, this is the view). 203 // The delegate for this object (in a real build, this is the view).
207 ToolbarActionsBarDelegate* delegate_; 204 ToolbarActionsBarDelegate* delegate_;
208 205
209 // The associated browser. 206 // The associated browser.
210 Browser* browser_; 207 Browser* browser_;
211 208
212 // The observed toolbar model. 209 // The observed toolbar model.
213 extensions::ExtensionToolbarModel* model_; 210 extensions::ExtensionToolbarModel* model_;
(...skipping 29 matching lines...) Expand all
243 static bool pop_out_actions_to_run_; 240 static bool pop_out_actions_to_run_;
244 241
245 // If set to false, notifications for OnOverflowedActionWantsToRunChanged() 242 // If set to false, notifications for OnOverflowedActionWantsToRunChanged()
246 // will not be sent. Used because in unit tests there is no wrench menu to 243 // will not be sent. Used because in unit tests there is no wrench menu to
247 // alter. 244 // alter.
248 static bool send_overflowed_action_changes_; 245 static bool send_overflowed_action_changes_;
249 246
250 // True if an action in the overflow menu wants to run. 247 // True if an action in the overflow menu wants to run.
251 bool overflowed_action_wants_to_run_; 248 bool overflowed_action_wants_to_run_;
252 249
253 // True if we have checked to see if there is an extension bubble that should
254 // be displayed, and, if there is, shown that bubble.
255 bool checked_extension_bubble_;
256
257 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBar); 250 DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBar);
258 }; 251 };
259 252
260 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_ 253 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/extensions/extension_message_bubble_factory.cc ('k') | chrome/browser/ui/toolbar/toolbar_actions_bar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698