Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / panels / stacked_panel_collection.h

diff --git a/src/chrome/browser/ui/panels/stacked_panel_collection.h b/src/chrome/browser/ui/panels/stacked_panel_collection.h
index 790910a..fcafedf 100644 (file)
--- a/src/chrome/browser/ui/panels/stacked_panel_collection.h
+++ b/src/chrome/browser/ui/panels/stacked_panel_collection.h
@@ -24,44 +24,41 @@ class StackedPanelCollection : public PanelCollection,
   typedef std::list<Panel*> Panels;
 
   explicit StackedPanelCollection(PanelManager* panel_manager);
-  virtual ~StackedPanelCollection();
+  ~StackedPanelCollection() override;
 
   // PanelCollection OVERRIDES:
-  virtual void OnDisplayChanged() OVERRIDE;
-  virtual void RefreshLayout() OVERRIDE;
-  virtual void AddPanel(Panel* panel,
-                        PositioningMask positioning_mask) OVERRIDE;
-  virtual void RemovePanel(Panel* panel, RemovalReason reason) OVERRIDE;
-  virtual void CloseAll() OVERRIDE;
-  virtual void ResizePanelWindow(
-      Panel* panel,
-      const gfx::Size& preferred_window_size) OVERRIDE;
-  virtual panel::Resizability GetPanelResizability(
-      const Panel* panel) const OVERRIDE;
-  virtual void OnPanelResizedByMouse(Panel* panel,
-                                     const gfx::Rect& new_bounds) OVERRIDE;
-  virtual void OnPanelAttentionStateChanged(Panel* panel) OVERRIDE;
-  virtual void OnPanelTitlebarClicked(Panel* panel,
-                                      panel::ClickModifier modifier) OVERRIDE;
-  virtual void ActivatePanel(Panel* panel) OVERRIDE;
-  virtual void MinimizePanel(Panel* panel) OVERRIDE;
-  virtual void RestorePanel(Panel* panel) OVERRIDE;
-  virtual void OnMinimizeButtonClicked(Panel* panel,
-                                       panel::ClickModifier modifier) OVERRIDE;
-  virtual void OnRestoreButtonClicked(Panel* panel,
-                                      panel::ClickModifier modifier) OVERRIDE;
-  virtual bool CanShowMinimizeButton(const Panel* panel) const OVERRIDE;
-  virtual bool CanShowRestoreButton(const Panel* panel) const OVERRIDE;
-  virtual bool IsPanelMinimized(const Panel* panel) const OVERRIDE;
-  virtual bool UsesAlwaysOnTopPanels() const OVERRIDE;
-  virtual void SavePanelPlacement(Panel* panel) OVERRIDE;
-  virtual void RestorePanelToSavedPlacement() OVERRIDE;
-  virtual void DiscardSavedPanelPlacement()  OVERRIDE;
-  virtual void UpdatePanelOnCollectionChange(Panel* panel) OVERRIDE;
-  virtual void OnPanelExpansionStateChanged(Panel* panel) OVERRIDE;
-  virtual void OnPanelActiveStateChanged(Panel* panel) OVERRIDE;
-  virtual gfx::Rect GetInitialPanelBounds(
-      const gfx::Rect& requested_bounds) const OVERRIDE;
+  void OnDisplayChanged() override;
+  void RefreshLayout() override;
+  void AddPanel(Panel* panel, PositioningMask positioning_mask) override;
+  void RemovePanel(Panel* panel, RemovalReason reason) override;
+  void CloseAll() override;
+  void ResizePanelWindow(Panel* panel,
+                         const gfx::Size& preferred_window_size) override;
+  panel::Resizability GetPanelResizability(const Panel* panel) const override;
+  void OnPanelResizedByMouse(Panel* panel,
+                             const gfx::Rect& new_bounds) override;
+  void OnPanelAttentionStateChanged(Panel* panel) override;
+  void OnPanelTitlebarClicked(Panel* panel,
+                              panel::ClickModifier modifier) override;
+  void ActivatePanel(Panel* panel) override;
+  void MinimizePanel(Panel* panel) override;
+  void RestorePanel(Panel* panel) override;
+  void OnMinimizeButtonClicked(Panel* panel,
+                               panel::ClickModifier modifier) override;
+  void OnRestoreButtonClicked(Panel* panel,
+                              panel::ClickModifier modifier) override;
+  bool CanShowMinimizeButton(const Panel* panel) const override;
+  bool CanShowRestoreButton(const Panel* panel) const override;
+  bool IsPanelMinimized(const Panel* panel) const override;
+  bool UsesAlwaysOnTopPanels() const override;
+  void SavePanelPlacement(Panel* panel) override;
+  void RestorePanelToSavedPlacement() override;
+  void DiscardSavedPanelPlacement() override;
+  void UpdatePanelOnCollectionChange(Panel* panel) override;
+  void OnPanelExpansionStateChanged(Panel* panel) override;
+  void OnPanelActiveStateChanged(Panel* panel) override;
+  gfx::Rect GetInitialPanelBounds(
+      const gfx::Rect& requested_bounds) const override;
 
   Panel* GetPanelAbove(Panel* panel) const;
   Panel* GetPanelBelow(Panel* panel) const;
@@ -104,9 +101,9 @@ class StackedPanelCollection : public PanelCollection,
   };
 
   // Overridden from PanelBoundsBatchUpdateObserver:
-  virtual base::string16 GetTitle() const OVERRIDE;
-  virtual gfx::Image GetIcon() const OVERRIDE;
-  virtual void PanelBoundsBatchUpdateCompleted() OVERRIDE;
+  base::string16 GetTitle() const override;
+  gfx::Image GetIcon() const override;
+  void PanelBoundsBatchUpdateCompleted() override;
 
   // Returns the enclosing bounds that include all panels in the stack.
   gfx::Rect GetEnclosingBounds() const;