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

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

Issue 2720183002: [Views] Update ink drop for omnibox icons (Closed)
Patch Set: Update the behavior Created 3 years, 9 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_LOCATION_ICON_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_ICON_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_ICON_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_ICON_VIEW_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h" 9 #include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h"
10 #include "ui/gfx/animation/animation_delegate.h" 10 #include "ui/gfx/animation/animation_delegate.h"
(...skipping 10 matching lines...) Expand all
21 // page security status (after navigation has completed), or extension name (if 21 // page security status (after navigation has completed), or extension name (if
22 // the URL is a chrome-extension:// URL). 22 // the URL is a chrome-extension:// URL).
23 class LocationIconView : public IconLabelBubbleView, 23 class LocationIconView : public IconLabelBubbleView,
24 public gfx::AnimationDelegate { 24 public gfx::AnimationDelegate {
25 public: 25 public:
26 LocationIconView(const gfx::FontList& font_list, 26 LocationIconView(const gfx::FontList& font_list,
27 LocationBarView* location_bar); 27 LocationBarView* location_bar);
28 ~LocationIconView() override; 28 ~LocationIconView() override;
29 29
30 // IconLabelBubbleView: 30 // IconLabelBubbleView:
31 bool IsInkDropEnabled() const override;
31 gfx::Size GetMinimumSize() const override; 32 gfx::Size GetMinimumSize() const override;
32 bool OnMousePressed(const ui::MouseEvent& event) override; 33 bool OnMousePressed(const ui::MouseEvent& event) override;
33 bool OnMouseDragged(const ui::MouseEvent& event) override; 34 bool OnMouseDragged(const ui::MouseEvent& event) override;
34 void OnMouseReleased(const ui::MouseEvent& event) override; 35 void OnMouseReleased(const ui::MouseEvent& event) override;
35 void OnGestureEvent(ui::GestureEvent* event) override; 36 void OnGestureEvent(ui::GestureEvent* event) override;
36 bool GetTooltipText(const gfx::Point& p, 37 bool GetTooltipText(const gfx::Point& p,
37 base::string16* tooltip) const override; 38 base::string16* tooltip) const override;
38 SkColor GetTextColor() const override; 39 SkColor GetTextColor() const override;
39 bool OnActivate(const ui::Event& event) override; 40 bool OnActivate(const ui::Event& event) override;
40 void GetAccessibleNodeData(ui::AXNodeData* node_data) override; 41 void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 // True if hovering this view should display a tooltip. 76 // True if hovering this view should display a tooltip.
76 bool show_tooltip_; 77 bool show_tooltip_;
77 78
78 LocationBarView* location_bar_; 79 LocationBarView* location_bar_;
79 gfx::SlideAnimation animation_; 80 gfx::SlideAnimation animation_;
80 81
81 DISALLOW_COPY_AND_ASSIGN(LocationIconView); 82 DISALLOW_COPY_AND_ASSIGN(LocationIconView);
82 }; 83 };
83 84
84 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_ICON_VIEW_H_ 85 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_ICON_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698