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

Side by Side Diff: chrome/browser/ui/views/location_bar/zoom_bubble_view.h

Issue 1518543002: Adds MD ink ripple animations to buttons within location bar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adds MD ink ripple animations to buttons within location bar (with WidgetObserver) Created 4 years, 10 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_
7 7
8 #include "base/gtest_prod_util.h" 8 #include "base/gtest_prod_util.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/timer/timer.h" 10 #include "base/timer/timer.h"
11 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" 11 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
12 #include "chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view .h" 12 #include "chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view .h"
13 #include "content/public/browser/notification_observer.h" 13 #include "content/public/browser/notification_observer.h"
14 #include "content/public/browser/notification_registrar.h" 14 #include "content/public/browser/notification_registrar.h"
15 #include "extensions/browser/extension_icon_image.h" 15 #include "extensions/browser/extension_icon_image.h"
16 #include "ui/views/bubble/bubble_delegate.h" 16 #include "ui/views/bubble/bubble_delegate.h"
17 #include "ui/views/controls/button/button.h" 17 #include "ui/views/controls/button/button.h"
18 #include "ui/views/controls/label.h" 18 #include "ui/views/controls/label.h"
19 #include "ui/views/widget/widget_observer_view.h"
19 20
20 class FullscreenController; 21 class FullscreenController;
21 22
22 namespace content { 23 namespace content {
23 class NotificationDetails; 24 class NotificationDetails;
24 class NotificationSource; 25 class NotificationSource;
25 class WebContents; 26 class WebContents;
26 } 27 }
27 28
28 namespace views { 29 namespace views {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 63
63 // The name of the extension, which appears in the tooltip of the image 64 // The name of the extension, which appears in the tooltip of the image
64 // button in the zoom bubble. 65 // button in the zoom bubble.
65 std::string name; 66 std::string name;
66 67
67 // An image of the extension's icon, which appears in the zoom bubble as an 68 // An image of the extension's icon, which appears in the zoom bubble as an
68 // image button. 69 // image button.
69 scoped_ptr<const extensions::IconImage> icon_image; 70 scoped_ptr<const extensions::IconImage> icon_image;
70 }; 71 };
71 72
72 ZoomBubbleView(views::View* anchor_view, 73 ZoomBubbleView(views::WidgetObserverView* anchor_view,
73 content::WebContents* web_contents, 74 content::WebContents* web_contents,
74 DisplayReason reason, 75 DisplayReason reason,
75 ImmersiveModeController* immersive_mode_controller); 76 ImmersiveModeController* immersive_mode_controller);
76 ~ZoomBubbleView() override; 77 ~ZoomBubbleView() override;
77 78
78 // LocationBarBubbleDelegateView: 79 // LocationBarBubbleDelegateView:
79 void OnGestureEvent(ui::GestureEvent* event) override; 80 void OnGestureEvent(ui::GestureEvent* event) override;
80 void OnMouseEntered(const ui::MouseEvent& event) override; 81 void OnMouseEntered(const ui::MouseEvent& event) override;
81 void OnMouseExited(const ui::MouseEvent& event) override; 82 void OnMouseExited(const ui::MouseEvent& event) override;
82 void Init() override; 83 void Init() override;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 135
135 // The immersive mode controller for the BrowserView containing 136 // The immersive mode controller for the BrowserView containing
136 // |web_contents_|. 137 // |web_contents_|.
137 // Not owned. 138 // Not owned.
138 ImmersiveModeController* immersive_mode_controller_; 139 ImmersiveModeController* immersive_mode_controller_;
139 140
140 DISALLOW_COPY_AND_ASSIGN(ZoomBubbleView); 141 DISALLOW_COPY_AND_ASSIGN(ZoomBubbleView);
141 }; 142 };
142 143
143 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_ 144 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698