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

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

Issue 1877143002: Convert ToolbarActionsBarBubbleViews to BubbleDialogDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 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 <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 14 matching lines...) Expand all
25 25
26 class ExtensionPopup; 26 class ExtensionPopup;
27 27
28 namespace extensions { 28 namespace extensions {
29 class ActiveTabPermissionGranter; 29 class ActiveTabPermissionGranter;
30 class Command; 30 class Command;
31 class Extension; 31 class Extension;
32 } 32 }
33 33
34 namespace views { 34 namespace views {
35 class BubbleDelegateView; 35 class BubbleDialogDelegateView;
36 class ResizeArea; 36 class ResizeArea;
37 } 37 }
38 38
39 // The BrowserActionsContainer is a container view, responsible for drawing the 39 // The BrowserActionsContainer is a container view, responsible for drawing the
40 // toolbar action icons (including extension icons and icons for component 40 // toolbar action icons (including extension icons and icons for component
41 // toolbar actions). It comes intwo flavors, a main container (when residing on 41 // toolbar actions). It comes intwo flavors, a main container (when residing on
42 // the toolbar) and an overflow container (that resides in the main application 42 // the toolbar) and an overflow container (that resides in the main application
43 // menu, aka the Chrome menu). 43 // menu, aka the Chrome menu).
44 // 44 //
45 // When in 'main' mode, the container supports the full functionality of a 45 // When in 'main' mode, the container supports the full functionality of a
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 bool IsAnimating() const override; 239 bool IsAnimating() const override;
240 void StopAnimating() override; 240 void StopAnimating() override;
241 int GetChevronWidth() const override; 241 int GetChevronWidth() const override;
242 void ShowToolbarActionBubble( 242 void ShowToolbarActionBubble(
243 std::unique_ptr<ToolbarActionsBarBubbleDelegate> controller) override; 243 std::unique_ptr<ToolbarActionsBarBubbleDelegate> controller) override;
244 244
245 // views::WidgetObserver: 245 // views::WidgetObserver:
246 void OnWidgetClosing(views::Widget* widget) override; 246 void OnWidgetClosing(views::Widget* widget) override;
247 void OnWidgetDestroying(views::Widget* widget) override; 247 void OnWidgetDestroying(views::Widget* widget) override;
248 248
249 views::BubbleDelegateView* active_bubble() { return active_bubble_; } 249 views::BubbleDialogDelegateView* active_bubble() { return active_bubble_; }
250 250
251 ChevronMenuButton* chevron_for_testing() { return chevron_; } 251 ChevronMenuButton* chevron_for_testing() { return chevron_; }
252 252
253 protected: 253 protected:
254 // Overridden from views::View: 254 // Overridden from views::View:
255 void ViewHierarchyChanged( 255 void ViewHierarchyChanged(
256 const ViewHierarchyChangedDetails& details) override; 256 const ViewHierarchyChangedDetails& details) override;
257 void OnPaint(gfx::Canvas* canvas) override; 257 void OnPaint(gfx::Canvas* canvas) override;
258 void OnThemeChanged() override; 258 void OnThemeChanged() override;
259 259
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 321
322 // Keeps track of the absolute pixel width the container should have when we 322 // Keeps track of the absolute pixel width the container should have when we
323 // are done animating. 323 // are done animating.
324 int animation_target_size_; 324 int animation_target_size_;
325 325
326 // The DropPosition for the current drag-and-drop operation, or NULL if there 326 // The DropPosition for the current drag-and-drop operation, or NULL if there
327 // is none. 327 // is none.
328 std::unique_ptr<DropPosition> drop_position_; 328 std::unique_ptr<DropPosition> drop_position_;
329 329
330 // The extension bubble that is actively showing, if any. 330 // The extension bubble that is actively showing, if any.
331 views::BubbleDelegateView* active_bubble_; 331 views::BubbleDialogDelegateView* active_bubble_;
332 332
333 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer); 333 DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
334 }; 334 };
335 335
336 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_ 336 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698