Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / views / controls / tabbed_pane / tabbed_pane.h

diff --git a/src/ui/views/controls/tabbed_pane/tabbed_pane.h b/src/ui/views/controls/tabbed_pane/tabbed_pane.h
index 83c7fef..1ca3ac1 100644 (file)
--- a/src/ui/views/controls/tabbed_pane/tabbed_pane.h
+++ b/src/ui/views/controls/tabbed_pane/tabbed_pane.h
@@ -24,7 +24,7 @@ class VIEWS_EXPORT TabbedPane : public View {
   static const char kViewClassName[];
 
   TabbedPane();
-  virtual ~TabbedPane();
+  ~TabbedPane() override;
 
   TabbedPaneListener* listener() const { return listener_; }
   void set_listener(TabbedPaneListener* listener) { listener_ = listener; }
@@ -54,8 +54,8 @@ class VIEWS_EXPORT TabbedPane : public View {
   void SelectTab(Tab* tab);
 
   // Overridden from View:
-  virtual gfx::Size GetPreferredSize() const OVERRIDE;
-  virtual const char* GetClassName() const OVERRIDE;
+  gfx::Size GetPreferredSize() const override;
+  const char* GetClassName() const override;
 
  private:
    friend class TabStrip;
@@ -64,12 +64,12 @@ class VIEWS_EXPORT TabbedPane : public View {
    Tab* GetTabAt(int index);
 
   // Overridden from View:
-  virtual void Layout() OVERRIDE;
-  virtual void ViewHierarchyChanged(
-      const ViewHierarchyChangedDetails& details) OVERRIDE;
-  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
-  virtual void OnFocus() OVERRIDE;
-  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
+   void Layout() override;
+   void ViewHierarchyChanged(
+       const ViewHierarchyChangedDetails& details) override;
+   bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
+   void OnFocus() override;
+   void GetAccessibleState(ui::AXViewState* state) override;
 
   // A listener notified when tab selection changes. Weak, not owned.
   TabbedPaneListener* listener_;