Index: chrome/browser/ui/views/location_bar/script_bubble_icon_view.h |
diff --git a/chrome/browser/ui/views/location_bar/script_bubble_icon_view.h b/chrome/browser/ui/views/location_bar/script_bubble_icon_view.h |
index 2b724638b7f6f63f3bedabb425557c55e068cd4e..8e04e9e4fd8f41ce7030a44aaa67dc785d9e345f 100644 |
--- a/chrome/browser/ui/views/location_bar/script_bubble_icon_view.h |
+++ b/chrome/browser/ui/views/location_bar/script_bubble_icon_view.h |
@@ -6,38 +6,31 @@ |
#define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_SCRIPT_BUBBLE_ICON_VIEW_H_ |
#include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
-#include "chrome/browser/ui/views/location_bar/touchable_location_bar_view.h" |
#include "ui/views/controls/image_view.h" |
-class CommandUpdater; |
- |
// The ScriptBubbleIconView is the code behind the script bubble icon |
// that we show in the Omnibox badged with a number to represent how many |
// extensions are running content_scripts in the current page. |
-class ScriptBubbleIconView : public views::ImageView, |
- public TouchableLocationBarView { |
+class ScriptBubbleIconView : public views::ImageView { |
public: |
explicit ScriptBubbleIconView( |
LocationBarView::Delegate* location_bar_delegate); |
virtual ~ScriptBubbleIconView(); |
- // TouchableLocationBarView methods. |
- virtual int GetBuiltInHorizontalPadding() const OVERRIDE; |
- |
// Updates the number shown on the script bubble icon. |
void SetScriptCount(size_t script_count); |
private: |
- // views::View methods. |
+ // views::View: |
virtual void Layout() OVERRIDE; |
- // views::ImageView methods. |
+ // views::ImageView: |
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; |
virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; |
virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; |
virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; |
- // ui::EventHandler overrides: |
+ // ui::EventHandler: |
virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; |
// Shows the script bubble, anchored to anchor_view. |
@@ -50,7 +43,7 @@ class ScriptBubbleIconView : public views::ImageView, |
// The last reported script count. |
size_t script_count_; |
- DISALLOW_IMPLICIT_CONSTRUCTORS(ScriptBubbleIconView); |
+ DISALLOW_COPY_AND_ASSIGN(ScriptBubbleIconView); |
}; |
#endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_SCRIPT_BUBBLE_ICON_VIEW_H_ |