Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / tabs / browser_tab_strip_controller.h

diff --git a/src/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h b/src/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h
index ec4839a..15d1621 100644 (file)
--- a/src/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h
+++ b/src/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h
@@ -32,7 +32,7 @@ class BrowserTabStripController : public TabStripController,
                                   public TabStripModelObserver {
  public:
   BrowserTabStripController(Browser* browser, TabStripModel* model);
-  virtual ~BrowserTabStripController();
+  ~BrowserTabStripController() override;
 
   void InitFromModel(TabStrip* tabstrip);
 
@@ -45,63 +45,59 @@ class BrowserTabStripController : public TabStripController,
   bool IsTabPinned(Tab* tab) const;
 
   // TabStripController implementation:
-  virtual const ui::ListSelectionModel& GetSelectionModel() OVERRIDE;
-  virtual int GetCount() const OVERRIDE;
-  virtual bool IsValidIndex(int model_index) const OVERRIDE;
-  virtual bool IsActiveTab(int model_index) const OVERRIDE;
-  virtual int GetActiveIndex() const OVERRIDE;
-  virtual bool IsTabSelected(int model_index) const OVERRIDE;
-  virtual bool IsTabPinned(int model_index) const OVERRIDE;
-  virtual bool IsNewTabPage(int model_index) const OVERRIDE;
-  virtual void SelectTab(int model_index) OVERRIDE;
-  virtual void ExtendSelectionTo(int model_index) OVERRIDE;
-  virtual void ToggleSelected(int model_index) OVERRIDE;
-  virtual void AddSelectionFromAnchorTo(int model_index) OVERRIDE;
-  virtual void CloseTab(int model_index, CloseTabSource source) OVERRIDE;
-  virtual void ToggleTabAudioMute(int model_index) OVERRIDE;
-  virtual void ShowContextMenuForTab(Tab* tab,
-                                     const gfx::Point& p,
-                                     ui::MenuSourceType source_type) OVERRIDE;
-  virtual void UpdateLoadingAnimations() OVERRIDE;
-  virtual int HasAvailableDragActions() const OVERRIDE;
-  virtual void OnDropIndexUpdate(int index, bool drop_before) OVERRIDE;
-  virtual void PerformDrop(bool drop_before,
-                           int index,
-                           const GURL& url) OVERRIDE;
-  virtual bool IsCompatibleWith(TabStrip* other) const OVERRIDE;
-  virtual void CreateNewTab() OVERRIDE;
-  virtual void CreateNewTabWithLocation(const base::string16& loc) OVERRIDE;
-  virtual bool IsIncognito() OVERRIDE;
-  virtual void StackedLayoutMaybeChanged() OVERRIDE;
-  virtual void OnStartedDraggingTabs() OVERRIDE;
-  virtual void OnStoppedDraggingTabs() OVERRIDE;
-  virtual void CheckFileSupported(const GURL& url) OVERRIDE;
+  const ui::ListSelectionModel& GetSelectionModel() override;
+  int GetCount() const override;
+  bool IsValidIndex(int model_index) const override;
+  bool IsActiveTab(int model_index) const override;
+  int GetActiveIndex() const override;
+  bool IsTabSelected(int model_index) const override;
+  bool IsTabPinned(int model_index) const override;
+  bool IsNewTabPage(int model_index) const override;
+  void SelectTab(int model_index) override;
+  void ExtendSelectionTo(int model_index) override;
+  void ToggleSelected(int model_index) override;
+  void AddSelectionFromAnchorTo(int model_index) override;
+  void CloseTab(int model_index, CloseTabSource source) override;
+  void ToggleTabAudioMute(int model_index) override;
+  void ShowContextMenuForTab(Tab* tab,
+                             const gfx::Point& p,
+                             ui::MenuSourceType source_type) override;
+  void UpdateLoadingAnimations() override;
+  int HasAvailableDragActions() const override;
+  void OnDropIndexUpdate(int index, bool drop_before) override;
+  void PerformDrop(bool drop_before, int index, const GURL& url) override;
+  bool IsCompatibleWith(TabStrip* other) const override;
+  void CreateNewTab() override;
+  void CreateNewTabWithLocation(const base::string16& loc) override;
+  bool IsIncognito() override;
+  void StackedLayoutMaybeChanged() override;
+  void OnStartedDraggingTabs() override;
+  void OnStoppedDraggingTabs() override;
+  void CheckFileSupported(const GURL& url) override;
 
   // TabStripModelObserver implementation:
-  virtual void TabInsertedAt(content::WebContents* contents,
-                             int model_index,
-                             bool is_active) OVERRIDE;
-  virtual void TabDetachedAt(content::WebContents* contents,
-                             int model_index) OVERRIDE;
-  virtual void TabSelectionChanged(
-      TabStripModel* tab_strip_model,
-      const ui::ListSelectionModel& old_model) OVERRIDE;
-  virtual void TabMoved(content::WebContents* contents,
-                        int from_model_index,
-                        int to_model_index) OVERRIDE;
-  virtual void TabChangedAt(content::WebContents* contents,
-                            int model_index,
-                            TabChangeType change_type) OVERRIDE;
-  virtual void TabReplacedAt(TabStripModel* tab_strip_model,
-                             content::WebContents* old_contents,
-                             content::WebContents* new_contents,
-                             int model_index) OVERRIDE;
-  virtual void TabPinnedStateChanged(content::WebContents* contents,
-                                     int model_index) OVERRIDE;
-  virtual void TabMiniStateChanged(content::WebContents* contents,
-                                   int model_index) OVERRIDE;
-  virtual void TabBlockedStateChanged(content::WebContents* contents,
-                                      int model_index) OVERRIDE;
+  void TabInsertedAt(content::WebContents* contents,
+                     int model_index,
+                     bool is_active) override;
+  void TabDetachedAt(content::WebContents* contents, int model_index) override;
+  void TabSelectionChanged(TabStripModel* tab_strip_model,
+                           const ui::ListSelectionModel& old_model) override;
+  void TabMoved(content::WebContents* contents,
+                int from_model_index,
+                int to_model_index) override;
+  void TabChangedAt(content::WebContents* contents,
+                    int model_index,
+                    TabChangeType change_type) override;
+  void TabReplacedAt(TabStripModel* tab_strip_model,
+                     content::WebContents* old_contents,
+                     content::WebContents* new_contents,
+                     int model_index) override;
+  void TabPinnedStateChanged(content::WebContents* contents,
+                             int model_index) override;
+  void TabMiniStateChanged(content::WebContents* contents,
+                           int model_index) override;
+  void TabBlockedStateChanged(content::WebContents* contents,
+                              int model_index) override;
 
  protected:
   // The context in which SetTabRendererDataFromModel is being called.