Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / system / chromeos / screen_security / screen_tray_item.h

diff --git a/src/ash/system/chromeos/screen_security/screen_tray_item.h b/src/ash/system/chromeos/screen_security/screen_tray_item.h
index 9e5880d..59e0d35 100644 (file)
--- a/src/ash/system/chromeos/screen_security/screen_tray_item.h
+++ b/src/ash/system/chromeos/screen_security/screen_tray_item.h
@@ -47,11 +47,11 @@ class ScreenStatusView : public views::View,
   virtual ~ScreenStatusView();
 
   // Overridden from views::View.
-  virtual void Layout() OVERRIDE;
+  virtual void Layout() override;
 
   // Overridden from views::ButtonListener.
   virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) OVERRIDE;
+                             const ui::Event& event) override;
 
   void CreateItems();
   void Update();
@@ -73,11 +73,7 @@ class ScreenNotificationDelegate : public message_center::NotificationDelegate {
   explicit ScreenNotificationDelegate(ScreenTrayItem* screen_tray);
 
   // message_center::NotificationDelegate overrides:
-  virtual void Display() OVERRIDE;
-  virtual void Error() OVERRIDE;
-  virtual void Close(bool by_user) OVERRIDE;
-  virtual void Click() OVERRIDE;
-  virtual void ButtonClick(int button_index) OVERRIDE;
+  virtual void ButtonClick(int button_index) override;
 
  protected:
   virtual ~ScreenNotificationDelegate();
@@ -123,12 +119,12 @@ class ASH_EXPORT ScreenTrayItem : public SystemTrayItem {
   virtual std::string GetNotificationId() = 0;
 
   // Overridden from SystemTrayItem.
-  virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE = 0;
-  virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE = 0;
-  virtual void DestroyTrayView() OVERRIDE;
-  virtual void DestroyDefaultView() OVERRIDE;
+  virtual views::View* CreateTrayView(user::LoginStatus status) override = 0;
+  virtual views::View* CreateDefaultView(user::LoginStatus status) override = 0;
+  virtual void DestroyTrayView() override;
+  virtual void DestroyDefaultView() override;
   virtual void UpdateAfterShelfAlignmentChange(
-      ShelfAlignment alignment) OVERRIDE;
+      ShelfAlignment alignment) override;
 
  private:
   tray::ScreenTrayView* tray_view_;