Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / message_center / views / notifier_settings_view.cc

diff --git a/src/ui/message_center/views/notifier_settings_view.cc b/src/ui/message_center/views/notifier_settings_view.cc
index cbe285b..856546b 100644 (file)
--- a/src/ui/message_center/views/notifier_settings_view.cc
+++ b/src/ui/message_center/views/notifier_settings_view.cc
@@ -126,17 +126,17 @@ scoped_ptr<views::Painter> CreateFocusPainter() {
 class EntryView : public views::View {
  public:
   explicit EntryView(views::View* contents);
-  virtual ~EntryView();
+  ~EntryView() override;
 
   // views::View:
-  virtual void Layout() OVERRIDE;
-  virtual gfx::Size GetPreferredSize() const OVERRIDE;
-  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
-  virtual void OnFocus() OVERRIDE;
-  virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
-  virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE;
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
-  virtual void OnBlur() OVERRIDE;
+  void Layout() override;
+  gfx::Size GetPreferredSize() const override;
+  void GetAccessibleState(ui::AXViewState* state) override;
+  void OnFocus() override;
+  bool OnKeyPressed(const ui::KeyEvent& event) override;
+  bool OnKeyReleased(const ui::KeyEvent& event) override;
+  void OnPaint(gfx::Canvas* canvas) override;
+  void OnBlur() override;
 
  private:
   scoped_ptr<views::Painter> focus_painter_;
@@ -207,15 +207,14 @@ class NotifierGroupMenuModel : public ui::SimpleMenuModel,
                                public ui::SimpleMenuModel::Delegate {
  public:
   NotifierGroupMenuModel(NotifierSettingsProvider* notifier_settings_provider);
-  virtual ~NotifierGroupMenuModel();
+  ~NotifierGroupMenuModel() override;
 
   // ui::SimpleMenuModel::Delegate:
-  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
-  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
-  virtual bool GetAcceleratorForCommandId(
-      int command_id,
-      ui::Accelerator* accelerator) OVERRIDE;
-  virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
+  bool IsCommandIdChecked(int command_id) const override;
+  bool IsCommandIdEnabled(int command_id) const override;
+  bool GetAcceleratorForCommandId(int command_id,
+                                  ui::Accelerator* accelerator) override;
+  void ExecuteCommand(int command_id, int event_flags) override;
 
  private:
   NotifierSettingsProvider* notifier_settings_provider_;