Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / system / tray / tray_image_item.h

diff --git a/src/ash/system/tray/tray_image_item.h b/src/ash/system/tray/tray_image_item.h
index 6fad95f..64a28c1 100644 (file)
--- a/src/ash/system/tray/tray_image_item.h
+++ b/src/ash/system/tray/tray_image_item.h
@@ -17,7 +17,7 @@ class TrayItemView;
 class TrayImageItem : public SystemTrayItem {
  public:
   TrayImageItem(SystemTray* system_tray, int resource_id);
-  virtual ~TrayImageItem();
+  ~TrayImageItem() override;
 
   views::View* tray_view();
 
@@ -28,15 +28,14 @@ class TrayImageItem : public SystemTrayItem {
   virtual bool GetInitialVisibility() = 0;
 
   // Overridden from SystemTrayItem.
-  virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
-  virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
-  virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
-  virtual void DestroyTrayView() OVERRIDE;
-  virtual void DestroyDefaultView() OVERRIDE;
-  virtual void DestroyDetailedView() OVERRIDE;
-  virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
-  virtual void UpdateAfterShelfAlignmentChange(
-      ShelfAlignment alignment) OVERRIDE;
+  views::View* CreateTrayView(user::LoginStatus status) override;
+  views::View* CreateDefaultView(user::LoginStatus status) override;
+  views::View* CreateDetailedView(user::LoginStatus status) override;
+  void DestroyTrayView() override;
+  void DestroyDefaultView() override;
+  void DestroyDetailedView() override;
+  void UpdateAfterLoginStatusChange(user::LoginStatus status) override;
+  void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;
 
  private:
   // Set the alignment of the image depending on the shelf alignment.