| Index: chrome/browser/ui/views/location_bar/location_icon_view.h
|
| diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.h b/chrome/browser/ui/views/location_bar/location_icon_view.h
|
| index ac083689d0f4491200fd779f1357857a7143f294..42fd41af7541d1464a950af752c5b525b3bf1581 100644
|
| --- a/chrome/browser/ui/views/location_bar/location_icon_view.h
|
| +++ b/chrome/browser/ui/views/location_bar/location_icon_view.h
|
| @@ -12,16 +12,11 @@
|
|
|
| class LocationBarView;
|
|
|
| -namespace ui {
|
| -class LocatedEvent;
|
| -}
|
| -
|
| // Use a LocationIconView to display an icon on the leading side of the edit
|
| // field. It shows the user's current action (while the user is editing), or the
|
| // page security status (after navigation has completed), or extension name (if
|
| // the URL is a chrome-extension:// URL).
|
| -class LocationIconView : public IconLabelBubbleView,
|
| - public gfx::AnimationDelegate {
|
| +class LocationIconView : public IconLabelBubbleView {
|
| public:
|
| LocationIconView(const gfx::FontList& font_list,
|
| LocationBarView* location_bar);
|
| @@ -31,13 +26,12 @@ class LocationIconView : public IconLabelBubbleView,
|
| gfx::Size GetMinimumSize() const override;
|
| bool OnMousePressed(const ui::MouseEvent& event) override;
|
| bool OnMouseDragged(const ui::MouseEvent& event) override;
|
| - void OnMouseReleased(const ui::MouseEvent& event) override;
|
| - void OnGestureEvent(ui::GestureEvent* event) override;
|
| bool GetTooltipText(const gfx::Point& p,
|
| base::string16* tooltip) const override;
|
| SkColor GetTextColor() const override;
|
| bool OnActivate(const ui::Event& event) override;
|
| void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
|
| + bool IsBubbleShown() const override;
|
|
|
| // Whether we should show the tooltip for this icon or not.
|
| void set_show_tooltip(bool show_tooltip) { show_tooltip_ = show_tooltip; }
|
| @@ -51,6 +45,10 @@ class LocationIconView : public IconLabelBubbleView,
|
| // any necessary transition to this state should be animated.
|
| void SetTextVisibility(bool should_show, bool should_animate);
|
|
|
| + protected:
|
| + // IconLabelBubbleView:
|
| + bool IsTriggerableEvent(const ui::Event& event) override;
|
| +
|
| private:
|
| // IconLabelBubbleView:
|
| double WidthMultiplier() const override;
|
| @@ -58,20 +56,9 @@ class LocationIconView : public IconLabelBubbleView,
|
| // gfx::AnimationDelegate:
|
| void AnimationProgressed(const gfx::Animation*) override;
|
|
|
| - void ProcessLocatedEvent(const ui::LocatedEvent& event);
|
| -
|
| // Returns what the minimum size would be if the preferred size were |size|.
|
| gfx::Size GetMinimumSizeForPreferredSize(gfx::Size size) const;
|
|
|
| - // Handles both click and gesture events by delegating to the page info
|
| - // helper in the appropriate circumstances.
|
| - void OnClickOrTap(const ui::LocatedEvent& event);
|
| -
|
| - // Set to true when the bubble is already showing at the time the icon is
|
| - // clicked. This suppresses re-showing the bubble on mouse release, so that
|
| - // clicking the icon repeatedly will appear to toggle the bubble on and off.
|
| - bool suppress_mouse_released_action_;
|
| -
|
| // True if hovering this view should display a tooltip.
|
| bool show_tooltip_;
|
|
|
|
|