| Index: chrome/browser/ui/views/tabs/browser_tab_strip_controller.h
|
| diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h
|
| index ec4839aecd7f71fe920a97da3d6824dd69bcb34e..b8577d85ac35c742180ea05279e514c845ff45c9 100644
|
| --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h
|
| +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h
|
| @@ -45,63 +45,63 @@ 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 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;
|
| + 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 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;
|
|
|
| // TabStripModelObserver implementation:
|
| virtual void TabInsertedAt(content::WebContents* contents,
|
| int model_index,
|
| - bool is_active) OVERRIDE;
|
| + bool is_active) override;
|
| virtual void TabDetachedAt(content::WebContents* contents,
|
| - int model_index) OVERRIDE;
|
| + int model_index) override;
|
| virtual void TabSelectionChanged(
|
| TabStripModel* tab_strip_model,
|
| - const ui::ListSelectionModel& old_model) OVERRIDE;
|
| + const ui::ListSelectionModel& old_model) override;
|
| virtual void TabMoved(content::WebContents* contents,
|
| int from_model_index,
|
| - int to_model_index) OVERRIDE;
|
| + int to_model_index) override;
|
| virtual void TabChangedAt(content::WebContents* contents,
|
| int model_index,
|
| - TabChangeType change_type) OVERRIDE;
|
| + TabChangeType change_type) override;
|
| virtual void TabReplacedAt(TabStripModel* tab_strip_model,
|
| content::WebContents* old_contents,
|
| content::WebContents* new_contents,
|
| - int model_index) OVERRIDE;
|
| + int model_index) override;
|
| virtual void TabPinnedStateChanged(content::WebContents* contents,
|
| - int model_index) OVERRIDE;
|
| + int model_index) override;
|
| virtual void TabMiniStateChanged(content::WebContents* contents,
|
| - int model_index) OVERRIDE;
|
| + int model_index) override;
|
| virtual void TabBlockedStateChanged(content::WebContents* contents,
|
| - int model_index) OVERRIDE;
|
| + int model_index) override;
|
|
|
| protected:
|
| // The context in which SetTabRendererDataFromModel is being called.
|
|
|