Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / system / overview / overview_button_tray.h

diff --git a/src/ash/system/overview/overview_button_tray.h b/src/ash/system/overview/overview_button_tray.h
index 32feb0c..1aca24a 100644 (file)
--- a/src/ash/system/overview/overview_button_tray.h
+++ b/src/ash/system/overview/overview_button_tray.h
@@ -8,6 +8,7 @@
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
 #include "ash/system/tray/tray_background_view.h"
+#include "ash/wm/overview/window_selector_controller.h"
 
 namespace views {
 class ImageView;
@@ -24,25 +25,25 @@ class ASH_EXPORT OverviewButtonTray : public TrayBackgroundView,
                                       public ShellObserver {
  public:
   explicit OverviewButtonTray(StatusAreaWidget* status_area_widget);
-  virtual ~OverviewButtonTray();
+  ~OverviewButtonTray() override;
 
   // Updates the tray's visibility based on the LoginStatus and the current
   // state of MaximizeMode
   virtual void UpdateAfterLoginStatusChange(user::LoginStatus status);
 
   // ActionableView:
-  virtual bool PerformAction(const ui::Event& event) OVERRIDE;
+  bool PerformAction(const ui::Event& event) override;
 
   // ShellObserver:
-  virtual void OnMaximizeModeStarted() OVERRIDE;
-  virtual void OnMaximizeModeEnded() OVERRIDE;
+  void OnMaximizeModeStarted() override;
+  void OnMaximizeModeEnded() override;
+  void OnOverviewModeEnding() override;
 
   // TrayBackgroundView:
-  virtual bool ClickedOutsideBubble() OVERRIDE;
-  virtual base::string16 GetAccessibleNameForTray() OVERRIDE;
-  virtual void HideBubbleWithView(
-      const views::TrayBubbleView* bubble_view) OVERRIDE;
-  virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE;
+  bool ClickedOutsideBubble() override;
+  base::string16 GetAccessibleNameForTray() override;
+  void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
+  void SetShelfAlignment(ShelfAlignment alignment) override;
 
  private:
   friend class OverviewButtonTrayTest;