| Index: chrome/browser/ui/views/tabs/tab_unittest.cc
|
| diff --git a/chrome/browser/ui/views/tabs/tab_unittest.cc b/chrome/browser/ui/views/tabs/tab_unittest.cc
|
| index 6584f146748e0becc0e8e992ccbff70151b29a1b..62a8a8b72519f5861992628475b27eb7b4609a5c 100644
|
| --- a/chrome/browser/ui/views/tabs/tab_unittest.cc
|
| +++ b/chrome/browser/ui/views/tabs/tab_unittest.cc
|
| @@ -26,45 +26,45 @@ class FakeTabController : public TabController {
|
| void set_immersive_style(bool value) { immersive_style_ = value; }
|
| void set_active_tab(bool value) { active_tab_ = value; }
|
|
|
| - virtual const ui::ListSelectionModel& GetSelectionModel() OVERRIDE {
|
| + virtual const ui::ListSelectionModel& GetSelectionModel() override {
|
| return selection_model_;
|
| }
|
| - virtual bool SupportsMultipleSelection() OVERRIDE { return false; }
|
| - virtual void SelectTab(Tab* tab) OVERRIDE {}
|
| - virtual void ExtendSelectionTo(Tab* tab) OVERRIDE {}
|
| - virtual void ToggleSelected(Tab* tab) OVERRIDE {}
|
| - virtual void AddSelectionFromAnchorTo(Tab* tab) OVERRIDE {}
|
| - virtual void CloseTab(Tab* tab, CloseTabSource source) OVERRIDE {}
|
| - virtual void ToggleTabAudioMute(Tab* tab) OVERRIDE {}
|
| + virtual bool SupportsMultipleSelection() override { return false; }
|
| + virtual void SelectTab(Tab* tab) override {}
|
| + virtual void ExtendSelectionTo(Tab* tab) override {}
|
| + virtual void ToggleSelected(Tab* tab) override {}
|
| + virtual void AddSelectionFromAnchorTo(Tab* tab) override {}
|
| + virtual void CloseTab(Tab* tab, CloseTabSource source) override {}
|
| + virtual void ToggleTabAudioMute(Tab* tab) override {}
|
| virtual void ShowContextMenuForTab(Tab* tab,
|
| const gfx::Point& p,
|
| - ui::MenuSourceType source_type) OVERRIDE {}
|
| - virtual bool IsActiveTab(const Tab* tab) const OVERRIDE {
|
| + ui::MenuSourceType source_type) override {}
|
| + virtual bool IsActiveTab(const Tab* tab) const override {
|
| return active_tab_;
|
| }
|
| - virtual bool IsTabSelected(const Tab* tab) const OVERRIDE {
|
| + virtual bool IsTabSelected(const Tab* tab) const override {
|
| return false;
|
| }
|
| - virtual bool IsTabPinned(const Tab* tab) const OVERRIDE { return false; }
|
| + virtual bool IsTabPinned(const Tab* tab) const override { return false; }
|
| virtual void MaybeStartDrag(
|
| Tab* tab,
|
| const ui::LocatedEvent& event,
|
| - const ui::ListSelectionModel& original_selection) OVERRIDE {}
|
| + const ui::ListSelectionModel& original_selection) override {}
|
| virtual void ContinueDrag(views::View* view,
|
| - const ui::LocatedEvent& event) OVERRIDE {}
|
| - virtual bool EndDrag(EndDragReason reason) OVERRIDE { return false; }
|
| + const ui::LocatedEvent& event) override {}
|
| + virtual bool EndDrag(EndDragReason reason) override { return false; }
|
| virtual Tab* GetTabAt(Tab* tab,
|
| - const gfx::Point& tab_in_tab_coordinates) OVERRIDE {
|
| + const gfx::Point& tab_in_tab_coordinates) override {
|
| return NULL;
|
| }
|
| virtual void OnMouseEventInTab(views::View* source,
|
| - const ui::MouseEvent& event) OVERRIDE {}
|
| - virtual bool ShouldPaintTab(const Tab* tab, gfx::Rect* clip) OVERRIDE {
|
| + const ui::MouseEvent& event) override {}
|
| + virtual bool ShouldPaintTab(const Tab* tab, gfx::Rect* clip) override {
|
| return true;
|
| }
|
| - virtual bool IsImmersiveStyle() const OVERRIDE { return immersive_style_; }
|
| + virtual bool IsImmersiveStyle() const override { return immersive_style_; }
|
| virtual void UpdateTabAccessibilityState(const Tab* tab,
|
| - ui::AXViewState* state) OVERRIDE{};
|
| + ui::AXViewState* state) override{};
|
|
|
| private:
|
| ui::ListSelectionModel selection_model_;
|
| @@ -82,7 +82,7 @@ class TabTest : public views::ViewsTestBase,
|
|
|
| bool testing_for_rtl_locale() const { return GetParam(); }
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| if (testing_for_rtl_locale()) {
|
| original_locale_ = base::i18n::GetConfiguredLocale();
|
| base::i18n::SetICUDefaultLocale("he");
|
| @@ -90,7 +90,7 @@ class TabTest : public views::ViewsTestBase,
|
| views::ViewsTestBase::SetUp();
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| views::ViewsTestBase::TearDown();
|
| if (testing_for_rtl_locale())
|
| base::i18n::SetICUDefaultLocale(original_locale_);
|
|
|