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

Side by Side Diff: chrome/browser/ui/views/toolbar/browser_actions_container.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 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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 int target_width, 245 int target_width,
246 bool suppress_chevron) override; 246 bool suppress_chevron) override;
247 void SetChevronVisibility(bool chevron_visible) override; 247 void SetChevronVisibility(bool chevron_visible) override;
248 int GetWidth() const override; 248 int GetWidth() const override;
249 bool IsAnimating() const override; 249 bool IsAnimating() const override;
250 void StopAnimating() override; 250 void StopAnimating() override;
251 int GetChevronWidth() const override; 251 int GetChevronWidth() const override;
252 bool IsPopupRunning() const override; 252 bool IsPopupRunning() const override;
253 void OnOverflowedActionWantsToRunChanged( 253 void OnOverflowedActionWantsToRunChanged(
254 bool overflowed_action_wants_to_run) override; 254 bool overflowed_action_wants_to_run) override;
255 void ShowExtensionMessageBubble(
256 scoped_ptr<extensions::ExtensionMessageBubbleController> controller)
257 override;
258 255
259 // Overridden from extension::ExtensionKeybindingRegistry::Delegate: 256 // Overridden from extension::ExtensionKeybindingRegistry::Delegate:
260 extensions::ActiveTabPermissionGranter* GetActiveTabPermissionGranter() 257 extensions::ActiveTabPermissionGranter* GetActiveTabPermissionGranter()
261 override; 258 override;
262 259
263 // Retrieve the current popup. This should only be used by unit tests. 260 // Retrieve the current popup. This should only be used by unit tests.
264 gfx::NativeView TestGetPopup(); 261 gfx::NativeView TestGetPopup();
265 262
266 protected: 263 protected:
267 // Overridden from views::View: 264 // Overridden from views::View:
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 // are done animating. 335 // are done animating.
339 int animation_target_size_; 336 int animation_target_size_;
340 337
341 // The DropPosition for the current drag-and-drop operation, or NULL if there 338 // The DropPosition for the current drag-and-drop operation, or NULL if there
342 // is none. 339 // is none.
343 scoped_ptr<DropPosition> drop_position_; 340 scoped_ptr<DropPosition> drop_position_;
344 341
345 // The class that registers for keyboard shortcuts for extension commands. 342 // The class that registers for keyboard shortcuts for extension commands.
346 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_; 343 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_;
347 344
348 // The controller of the bubble to show once animation finishes, if any.
349 scoped_ptr<extensions::ExtensionMessageBubbleController>
350 pending_extension_bubble_controller_;
351
352 ObserverList<BrowserActionsContainerObserver> observers_; 345 ObserverList<BrowserActionsContainerObserver> observers_;
353 346
354 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); 347 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
355 }; 348 };
356 349
357 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ 350 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698