Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / location_bar / bubble_icon_view.h

diff --git a/src/chrome/browser/ui/views/location_bar/bubble_icon_view.h b/src/chrome/browser/ui/views/location_bar/bubble_icon_view.h
index 8133b0f..7642824 100644 (file)
--- a/src/chrome/browser/ui/views/location_bar/bubble_icon_view.h
+++ b/src/chrome/browser/ui/views/location_bar/bubble_icon_view.h
@@ -19,7 +19,7 @@ class BubbleIconView : public views::ImageView {
   };
 
   explicit BubbleIconView(CommandUpdater* command_updater, int command_id);
-  virtual ~BubbleIconView();
+  ~BubbleIconView() override;
 
   // Returns true if a related bubble is showing.
   virtual bool IsBubbleShowing() const = 0;
@@ -28,17 +28,20 @@ class BubbleIconView : public views::ImageView {
   virtual void OnExecuting(ExecuteSource execute_source) = 0;
 
   // views::ImageView:
-  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
-  virtual bool GetTooltipText(const gfx::Point& p, base::string16* tooltip)
-      const 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;
+  void GetAccessibleState(ui::AXViewState* state) override;
+  bool GetTooltipText(const gfx::Point& p, base::string16* tooltip) const
+      override;
+  bool OnMousePressed(const ui::MouseEvent& event) override;
+  void OnMouseReleased(const ui::MouseEvent& event) override;
+  bool OnKeyPressed(const ui::KeyEvent& event) override;
 
   // ui::EventHandler:
-  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+  void OnGestureEvent(ui::GestureEvent* event) override;
 
  private:
+  // Calls OnExecuting and runs |command_id_| with a valid |command_updater_|.
+  void ExecuteCommand(ExecuteSource source);
+
   // The CommandUpdater for the Browser object that owns the location bar.
   CommandUpdater* command_updater_;