diff options
Diffstat (limited to 'chrome')
16 files changed, 247 insertions, 272 deletions
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h index 2a03be1..0ac06c0 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h @@ -31,20 +31,20 @@ class BookmarkBarInstructionsView : public views::View, BookmarkBarInstructionsDelegate* delegate); // views::View overrides. - virtual gfx::Size GetPreferredSize() const override; - virtual void Layout() override; - virtual void OnThemeChanged() override; - virtual void ViewHierarchyChanged( + gfx::Size GetPreferredSize() const override; + void Layout() override; + void OnThemeChanged() override; + void ViewHierarchyChanged( const ViewHierarchyChangedDetails& details) override; - virtual void GetAccessibleState(ui::AXViewState* state) override; + void GetAccessibleState(ui::AXViewState* state) override; // views::LinkListener overrides. - virtual void LinkClicked(views::Link* source, int event_flags) override; + void LinkClicked(views::Link* source, int event_flags) override; private: - virtual void ShowContextMenuForView(views::View* source, - const gfx::Point& point, - ui::MenuSourceType source_type) override; + void ShowContextMenuForView(views::View* source, + const gfx::Point& point, + ui::MenuSourceType source_type) override; void UpdateColors(); diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index 772d0a9..d53d036 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -184,11 +184,11 @@ class BookmarkButtonBase : public views::LabelButton { } } - virtual View* GetTooltipHandlerForPoint(const gfx::Point& point) override { + View* GetTooltipHandlerForPoint(const gfx::Point& point) override { return HitTestPoint(point) && CanProcessEventsWithinSubtree() ? this : NULL; } - virtual scoped_ptr<LabelButtonBorder> CreateDefaultBorder() const override { + scoped_ptr<LabelButtonBorder> CreateDefaultBorder() const override { scoped_ptr<LabelButtonBorder> border = LabelButton::CreateDefaultBorder(); border->set_insets(gfx::Insets(kButtonPaddingVertical, kButtonPaddingHorizontal, @@ -197,7 +197,7 @@ class BookmarkButtonBase : public views::LabelButton { return border.Pass(); } - virtual bool IsTriggerableEvent(const ui::Event& e) override { + bool IsTriggerableEvent(const ui::Event& e) override { return e.type() == ui::ET_GESTURE_TAP || e.type() == ui::ET_GESTURE_TAP_DOWN || event_utils::IsPossibleDispositionEvent(e); @@ -227,8 +227,8 @@ class BookmarkButton : public BookmarkButtonBase { profile_(profile) { } - virtual bool GetTooltipText(const gfx::Point& p, - base::string16* tooltip) const override { + bool GetTooltipText(const gfx::Point& p, + base::string16* tooltip) const override { gfx::Point location(p); ConvertPointToScreen(this, &location); *tooltip = BookmarkBarView::CreateToolTipForURLAndTitle( @@ -236,9 +236,7 @@ class BookmarkButton : public BookmarkButtonBase { return !tooltip->empty(); } - virtual const char* GetClassName() const override { - return kViewClassName; - } + const char* GetClassName() const override { return kViewClassName; } private: const GURL& url_; @@ -264,9 +262,7 @@ class ShortcutButton : public BookmarkButtonBase { : BookmarkButtonBase(listener, title) { } - virtual const char* GetClassName() const override { - return kViewClassName; - } + const char* GetClassName() const override { return kViewClassName; } private: DISALLOW_COPY_AND_ASSIGN(ShortcutButton); @@ -297,14 +293,14 @@ class BookmarkFolderButton : public views::MenuButton { } } - virtual bool GetTooltipText(const gfx::Point& p, - base::string16* tooltip) const override { + bool GetTooltipText(const gfx::Point& p, + base::string16* tooltip) const override { if (label()->GetPreferredSize().width() > label()->size().width()) *tooltip = GetText(); return !tooltip->empty(); } - virtual bool IsTriggerableEvent(const ui::Event& e) override { + bool IsTriggerableEvent(const ui::Event& e) override { // Left clicks and taps should show the menu contents and right clicks // should show the context menu. They should not trigger the opening of // underlying urls. @@ -332,7 +328,7 @@ class OverFlowButton : public views::MenuButton { : MenuButton(NULL, base::string16(), owner, false), owner_(owner) {} - virtual bool OnMousePressed(const ui::MouseEvent& e) override { + bool OnMousePressed(const ui::MouseEvent& e) override { owner_->StopThrobbing(true); return views::MenuButton::OnMousePressed(e); } @@ -418,9 +414,9 @@ struct BookmarkBarView::DropInfo { class BookmarkBarView::ButtonSeparatorView : public views::View { public: ButtonSeparatorView() {} - virtual ~ButtonSeparatorView() {} + ~ButtonSeparatorView() override {} - virtual void OnPaint(gfx::Canvas* canvas) override { + void OnPaint(gfx::Canvas* canvas) override { DetachableToolbarView::PaintVerticalDivider( canvas, kSeparatorStartX, height(), 1, DetachableToolbarView::kEdgeDividerColor, @@ -428,13 +424,13 @@ class BookmarkBarView::ButtonSeparatorView : public views::View { GetThemeProvider()->GetColor(ThemeProperties::COLOR_TOOLBAR)); } - virtual gfx::Size GetPreferredSize() const override { + gfx::Size GetPreferredSize() const override { // We get the full height of the bookmark bar, so that the height returned // here doesn't matter. return gfx::Size(kSeparatorWidth, 1); } - virtual void GetAccessibleState(ui::AXViewState* state) override { + void GetAccessibleState(ui::AXViewState* state) override { state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_SEPARATOR); state->role = ui::AX_ROLE_SPLITTER; } diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h index 1796f13..cdd76f5 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h @@ -85,7 +85,7 @@ class BookmarkBarView : public DetachableToolbarView, // |browser_view| can be NULL during tests. BookmarkBarView(Browser* browser, BrowserView* browser_view); - virtual ~BookmarkBarView(); + ~BookmarkBarView() override; static void DisableAnimationsForTesting(bool disabled); @@ -166,99 +166,95 @@ class BookmarkBarView : public DetachableToolbarView, Profile* profile); // DetachableToolbarView methods: - virtual bool IsDetached() const override; - virtual double GetAnimationValue() const override; - virtual int GetToolbarOverlap() const override; + bool IsDetached() const override; + double GetAnimationValue() const override; + int GetToolbarOverlap() const override; // View methods: - virtual gfx::Size GetPreferredSize() const override; - virtual gfx::Size GetMinimumSize() const override; - virtual bool CanProcessEventsWithinSubtree() const override; - virtual void Layout() override; - virtual void ViewHierarchyChanged( + gfx::Size GetPreferredSize() const override; + gfx::Size GetMinimumSize() const override; + bool CanProcessEventsWithinSubtree() const override; + void Layout() override; + void ViewHierarchyChanged( const ViewHierarchyChangedDetails& details) override; - virtual void PaintChildren(gfx::Canvas* canvas, - const views::CullSet& cull_set) override; - virtual bool GetDropFormats( + void PaintChildren(gfx::Canvas* canvas, + const views::CullSet& cull_set) override; + bool GetDropFormats( int* formats, std::set<ui::OSExchangeData::CustomFormat>* custom_formats) override; - virtual bool AreDropTypesRequired() override; - virtual bool CanDrop(const ui::OSExchangeData& data) override; - virtual void OnDragEntered(const ui::DropTargetEvent& event) override; - virtual int OnDragUpdated(const ui::DropTargetEvent& event) override; - virtual void OnDragExited() override; - virtual int OnPerformDrop(const ui::DropTargetEvent& event) override; - virtual void OnThemeChanged() override; - virtual const char* GetClassName() const override; - virtual void SetVisible(bool visible) override; + bool AreDropTypesRequired() override; + bool CanDrop(const ui::OSExchangeData& data) override; + void OnDragEntered(const ui::DropTargetEvent& event) override; + int OnDragUpdated(const ui::DropTargetEvent& event) override; + void OnDragExited() override; + int OnPerformDrop(const ui::DropTargetEvent& event) override; + void OnThemeChanged() override; + const char* GetClassName() const override; + void SetVisible(bool visible) override; // AccessiblePaneView: - virtual void GetAccessibleState(ui::AXViewState* state) override; + void GetAccessibleState(ui::AXViewState* state) override; // gfx::AnimationDelegate: - virtual void AnimationProgressed(const gfx::Animation* animation) override; - virtual void AnimationEnded(const gfx::Animation* animation) override; + void AnimationProgressed(const gfx::Animation* animation) override; + void AnimationEnded(const gfx::Animation* animation) override; // BookmarkMenuControllerObserver: - virtual void BookmarkMenuControllerDeleted( + void BookmarkMenuControllerDeleted( BookmarkMenuController* controller) override; // BookmarkBarInstructionsDelegate: - virtual void ShowImportDialog() override; + void ShowImportDialog() override; // BookmarkBubbleViewObserver: - virtual void OnBookmarkBubbleShown(const GURL& url) override; - virtual void OnBookmarkBubbleHidden() override; + void OnBookmarkBubbleShown(const GURL& url) override; + void OnBookmarkBubbleHidden() override; // BookmarkModelObserver: - virtual void BookmarkModelLoaded(BookmarkModel* model, - bool ids_reassigned) override; - virtual void BookmarkModelBeingDeleted(BookmarkModel* model) override; - virtual void BookmarkNodeMoved(BookmarkModel* model, - const BookmarkNode* old_parent, - int old_index, - const BookmarkNode* new_parent, - int new_index) override; - virtual void BookmarkNodeAdded(BookmarkModel* model, - const BookmarkNode* parent, - int index) override; - virtual void BookmarkNodeRemoved(BookmarkModel* model, - const BookmarkNode* parent, - int old_index, - const BookmarkNode* node, + void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override; + void BookmarkModelBeingDeleted(BookmarkModel* model) override; + void BookmarkNodeMoved(BookmarkModel* model, + const BookmarkNode* old_parent, + int old_index, + const BookmarkNode* new_parent, + int new_index) override; + void BookmarkNodeAdded(BookmarkModel* model, + const BookmarkNode* parent, + int index) override; + void BookmarkNodeRemoved(BookmarkModel* model, + const BookmarkNode* parent, + int old_index, + const BookmarkNode* node, + const std::set<GURL>& removed_urls) override; + void BookmarkAllUserNodesRemoved(BookmarkModel* model, const std::set<GURL>& removed_urls) override; - virtual void BookmarkAllUserNodesRemoved( - BookmarkModel* model, - const std::set<GURL>& removed_urls) override; - virtual void BookmarkNodeChanged(BookmarkModel* model, - const BookmarkNode* node) override; - virtual void BookmarkNodeChildrenReordered(BookmarkModel* model, - const BookmarkNode* node) override; - virtual void BookmarkNodeFaviconChanged(BookmarkModel* model, - const BookmarkNode* node) override; + void BookmarkNodeChanged(BookmarkModel* model, + const BookmarkNode* node) override; + void BookmarkNodeChildrenReordered(BookmarkModel* model, + const BookmarkNode* node) override; + void BookmarkNodeFaviconChanged(BookmarkModel* model, + const BookmarkNode* node) override; // views::DragController: - virtual void WriteDragDataForView(views::View* sender, - const gfx::Point& press_pt, - ui::OSExchangeData* data) override; - virtual int GetDragOperationsForView(views::View* sender, - const gfx::Point& p) override; - virtual bool CanStartDragForView(views::View* sender, - const gfx::Point& press_pt, - const gfx::Point& p) override; + void WriteDragDataForView(views::View* sender, + const gfx::Point& press_pt, + ui::OSExchangeData* data) override; + int GetDragOperationsForView(views::View* sender, + const gfx::Point& p) override; + bool CanStartDragForView(views::View* sender, + const gfx::Point& press_pt, + const gfx::Point& p) override; // views::MenuButtonListener: - virtual void OnMenuButtonClicked(views::View* view, - const gfx::Point& point) override; + void OnMenuButtonClicked(views::View* view, const gfx::Point& point) override; // views::ButtonListener: - virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) override; + void ButtonPressed(views::Button* sender, const ui::Event& event) override; // views::ContextMenuController: - virtual void ShowContextMenuForView(views::View* source, - const gfx::Point& point, - ui::MenuSourceType source_type) override; + void ShowContextMenuForView(views::View* source, + const gfx::Point& point, + ui::MenuSourceType source_type) override; private: class ButtonSeparatorView; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index 378910b..69f36e5 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -65,9 +65,7 @@ class DialogWaiter : public aura::EnvObserver, aura::Env::GetInstance()->AddObserver(this); } - virtual ~DialogWaiter() { - aura::Env::GetInstance()->RemoveObserver(this); - } + ~DialogWaiter() override { aura::Env::GetInstance()->RemoveObserver(this); } views::Widget* WaitForDialog() { if (dialog_created_) @@ -82,7 +80,7 @@ class DialogWaiter : public aura::EnvObserver, private: // aura::EnvObserver: - virtual void OnWindowInitialized(aura::Window* window) override { + void OnWindowInitialized(aura::Window* window) override { if (dialog_) return; views::Widget* widget = views::Widget::GetWidgetForNativeView(window); @@ -93,8 +91,7 @@ class DialogWaiter : public aura::EnvObserver, } // views::WidgetObserver: - virtual void OnWidgetVisibilityChanged(views::Widget* widget, - bool visible) override { + void OnWidgetVisibilityChanged(views::Widget* widget, bool visible) override { CHECK_EQ(dialog_, widget); if (visible) { dialog_created_ = true; @@ -119,7 +116,7 @@ class DialogCloseWaiter : public views::WidgetObserver { dialog->AddObserver(this); } - virtual ~DialogCloseWaiter() { + ~DialogCloseWaiter() override { // It is not necessary to remove |this| from the dialog's observer, since // the dialog is destroyed before this waiter. } @@ -136,7 +133,7 @@ class DialogCloseWaiter : public views::WidgetObserver { private: // views::WidgetObserver: - virtual void OnWidgetDestroyed(views::Widget* widget) override { + void OnWidgetDestroyed(views::Widget* widget) override { dialog_closed_ = true; if (!quit_closure_.is_null()) quit_closure_.Run(); @@ -157,7 +154,7 @@ class TabKeyWaiter : public ui::EventHandler { widget_->GetNativeView()->AddPreTargetHandler(this); } - virtual ~TabKeyWaiter() { + ~TabKeyWaiter() override { widget_->GetNativeView()->RemovePreTargetHandler(this); } @@ -173,7 +170,7 @@ class TabKeyWaiter : public ui::EventHandler { private: // ui::EventHandler: - virtual void OnKeyEvent(ui::KeyEvent* event) override { + void OnKeyEvent(ui::KeyEvent* event) override { if (event->type() == ui::ET_KEY_RELEASED && event->key_code() == ui::VKEY_TAB) { received_tab_ = true; @@ -200,7 +197,7 @@ void MoveMouseAndPress(const gfx::Point& screen_pos, // PageNavigator implementation that records the URL. class TestingPageNavigator : public PageNavigator { public: - virtual WebContents* OpenURL(const OpenURLParams& params) override { + WebContents* OpenURL(const OpenURLParams& params) override { url_ = params.url; return NULL; } @@ -254,7 +251,7 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase { : ViewEventTestBase(), model_(NULL) {} - virtual void SetUp() override { + void SetUp() override { content_client_.reset(new ChromeContentClient); content::SetContentClient(content_client_.get()); browser_content_client_.reset(new chrome::ChromeContentBrowserClient()); @@ -304,7 +301,7 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase { ViewEventTestBase::SetUp(); } - virtual void TearDown() { + void TearDown() override { // Destroy everything, then run the message loop to ensure we delete all // Tasks and fully shut down. browser_->tab_strip_model()->CloseAllTabs(); @@ -329,11 +326,9 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase { } protected: - virtual views::View* CreateContentsView() override { - return bb_view_.get(); - } + views::View* CreateContentsView() override { return bb_view_.get(); } - virtual gfx::Size GetPreferredSize() const override { return bb_view_pref_; } + gfx::Size GetPreferredSize() const override { return bb_view_pref_; } views::LabelButton* GetBookmarkButton(int view_index) { return bb_view_->GetBookmarkButton(view_index); @@ -391,7 +386,7 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase { // child, clicks it and makes sure a navigation occurs. class BookmarkBarViewTest1 : public BookmarkBarViewEventTestBase { protected: - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { // Move the mouse to the first folder on the bookmark bar and press the // mouse. views::LabelButton* button = GetBookmarkButton(0); @@ -442,7 +437,7 @@ VIEW_TEST(BookmarkBarViewTest1, Basic) // Brings up menu, clicks on empty space and make sure menu hides. class BookmarkBarViewTest2 : public BookmarkBarViewEventTestBase { protected: - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { // Move the mouse to the first folder on the bookmark bar and press the // mouse. views::LabelButton* button = GetBookmarkButton(0); @@ -503,7 +498,7 @@ VIEW_TEST(BookmarkBarViewTest2, MAYBE_HideOnDesktopClick) // another child and make sure next menu appears. class BookmarkBarViewTest3 : public BookmarkBarViewEventTestBase { protected: - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { // Move the mouse to the first folder on the bookmark bar and press the // mouse. views::MenuButton* button = bb_view_->other_bookmarked_button(); @@ -584,9 +579,9 @@ class BookmarkContextMenuNotificationObserver content::NotificationService::AllSources()); } - virtual void Observe(int type, - const content::NotificationSource& source, - const content::NotificationDetails& details) override { + void Observe(int type, + const content::NotificationSource& source, + const content::NotificationDetails& details) override { base::MessageLoop::current()->PostTask(FROM_HERE, task_); } @@ -610,7 +605,7 @@ class BookmarkBarViewTest4 : public BookmarkBarViewEventTestBase { } protected: - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { // Move the mouse to the first folder on the bookmark bar and press the // mouse. views::LabelButton* button = bb_view_->other_bookmarked_button(); @@ -663,7 +658,7 @@ VIEW_TEST(BookmarkBarViewTest4, ContextMenus) // Tests drag and drop within the same menu. class BookmarkBarViewTest5 : public BookmarkBarViewEventTestBase { protected: - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { url_dragging_ = model_->bookmark_bar_node()->GetChild(0)->GetChild(0)->url(); @@ -736,7 +731,7 @@ VIEW_TEST(BookmarkBarViewTest5, MAYBE(DND)) // then selecting an item. class BookmarkBarViewTest6 : public BookmarkBarViewEventTestBase { protected: - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { // Press the mouse button on the overflow button. Don't release it though. views::LabelButton* button = bb_view_->overflow_button(); ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT, @@ -773,7 +768,7 @@ VIEW_TEST(BookmarkBarViewTest6, OpenMenuOnClickAndHold) // Tests drag and drop to different menu. class BookmarkBarViewTest7 : public BookmarkBarViewEventTestBase { protected: - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { url_dragging_ = model_->bookmark_bar_node()->GetChild(0)->GetChild(0)->url(); @@ -873,7 +868,7 @@ VIEW_TEST(BookmarkBarViewTest7, MAYBE(DNDToDifferentMenu)) // original menu. class BookmarkBarViewTest8 : public BookmarkBarViewEventTestBase { protected: - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { url_dragging_ = model_->bookmark_bar_node()->GetChild(0)->GetChild(0)->url(); @@ -981,9 +976,9 @@ VIEW_TEST(BookmarkBarViewTest8, MAYBE(DNDBackToOriginatingMenu)) // Moves the mouse over the scroll button and makes sure we get scrolling. class BookmarkBarViewTest9 : public BookmarkBarViewEventTestBase { protected: - virtual bool CreateBigMenu() override { return true; } + bool CreateBigMenu() override { return true; } - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { // Move the mouse to the first folder on the bookmark bar and press the // mouse. views::LabelButton* button = GetBookmarkButton(0); @@ -1052,7 +1047,7 @@ VIEW_TEST(BookmarkBarViewTest9, ScrollButtonScrolls) // Tests up/down/left/enter key messages. class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase { protected: - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { // Move the mouse to the first folder on the bookmark bar and press the // mouse. views::LabelButton* button = GetBookmarkButton(0); @@ -1173,7 +1168,7 @@ class BookmarkBarViewTest11 : public BookmarkBarViewEventTestBase { } protected: - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { // Move the mouse to the first folder on the bookmark bar and press the // mouse. views::LabelButton* button = bb_view_->other_bookmarked_button(); @@ -1253,7 +1248,7 @@ VIEW_TEST(BookmarkBarViewTest11, MAYBE_CloseMenuAfterClosingContextMenu) // Tests showing a modal dialog from a context menu. class BookmarkBarViewTest12 : public BookmarkBarViewEventTestBase { protected: - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { // Open up the other folder. views::LabelButton* button = bb_view_->other_bookmarked_button(); ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT, @@ -1262,7 +1257,7 @@ class BookmarkBarViewTest12 : public BookmarkBarViewEventTestBase { chrome::num_bookmark_urls_before_prompting = 1; } - virtual ~BookmarkBarViewTest12() { + ~BookmarkBarViewTest12() override { chrome::num_bookmark_urls_before_prompting = 15; } @@ -1355,7 +1350,7 @@ class BookmarkBarViewTest13 : public BookmarkBarViewEventTestBase { } protected: - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { // Move the mouse to the first folder on the bookmark bar and press the // mouse. views::LabelButton* button = bb_view_->other_bookmarked_button(); @@ -1439,7 +1434,7 @@ class BookmarkBarViewTest14 : public BookmarkBarViewEventTestBase { } protected: - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { // Move the mouse to the first folder on the bookmark bar and press the // right mouse button. views::LabelButton* button = GetBookmarkButton(0); @@ -1486,7 +1481,7 @@ class BookmarkBarViewTest15 : public BookmarkBarViewEventTestBase { } protected: - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { // Show the other bookmarks. views::LabelButton* button = bb_view_->other_bookmarked_button(); ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT, @@ -1557,7 +1552,7 @@ VIEW_TEST(BookmarkBarViewTest15, MenuStaysVisibleAfterDelete) // Tests that we don't crash or get stuck if the parent of a menu is closed. class BookmarkBarViewTest16 : public BookmarkBarViewEventTestBase { protected: - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { // Move the mouse to the first folder on the bookmark bar and press the // mouse. views::LabelButton* button = GetBookmarkButton(0); @@ -1604,7 +1599,7 @@ class BookmarkBarViewTest17 : public BookmarkBarViewEventTestBase { } protected: - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { // Move the mouse to the other folder on the bookmark bar and press the // left mouse button. views::LabelButton* button = bb_view_->other_bookmarked_button(); @@ -1693,7 +1688,7 @@ VIEW_TEST(BookmarkBarViewTest17, MAYBE_ContextMenus3) // menu appears. class BookmarkBarViewTest18 : public BookmarkBarViewEventTestBase { protected: - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { // Move the mouse to the other folder on the bookmark bar and press the // left mouse button. views::LabelButton* button = bb_view_->other_bookmarked_button(); @@ -1750,7 +1745,7 @@ VIEW_TEST(BookmarkBarViewTest18, MAYBE_BookmarkBarViewTest18_SiblingMenu) // the menu. class BookmarkBarViewTest19 : public BookmarkBarViewEventTestBase { protected: - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { // Move the mouse to the other folder on the bookmark bar and press the // left mouse button. views::LabelButton* button = bb_view_->other_bookmarked_button(); @@ -1828,7 +1823,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEventTestBase { BookmarkBarViewTest20() : test_view_(new TestViewForMenuExit) {} protected: - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { // Add |test_view_| next to |bb_view_|. views::View* parent = bb_view_->parent(); views::View* container_view = new ContainerViewForMenuExit; @@ -1884,7 +1879,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEventTestBase { ContainerViewForMenuExit() { } - virtual void Layout() override { + void Layout() override { DCHECK_EQ(2, child_count()); views::View* bb_view = child_at(0); views::View* test_view = child_at(1); @@ -1903,7 +1898,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEventTestBase { public: TestViewForMenuExit() : press_count_(0) { } - virtual bool OnMousePressed(const ui::MouseEvent& event) override { + bool OnMousePressed(const ui::MouseEvent& event) override { ++press_count_; return true; } @@ -1938,7 +1933,7 @@ class BookmarkBarViewTest21 : public BookmarkBarViewEventTestBase { protected: // Move the mouse to the empty folder on the bookmark bar and press the // left mouse button. - virtual void DoTestOnMessageLoop() override { + void DoTestOnMessageLoop() override { views::LabelButton* button = GetBookmarkButton(5); ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP, diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc index 4ed91b51..68af4d2 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc @@ -45,9 +45,9 @@ const int kControlBorderWidth = 2; class UnsizedCombobox : public views::Combobox { public: explicit UnsizedCombobox(ui::ComboboxModel* model) : views::Combobox(model) {} - virtual ~UnsizedCombobox() {} + ~UnsizedCombobox() override {} - virtual gfx::Size GetPreferredSize() const override { + gfx::Size GetPreferredSize() const override { return gfx::Size(0, views::Combobox::GetPreferredSize().height()); } diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h index f99f167..244587d 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h @@ -44,20 +44,20 @@ class BookmarkBubbleView : public views::BubbleDelegateView, static void Hide(); - virtual ~BookmarkBubbleView(); + ~BookmarkBubbleView() override; // views::BubbleDelegateView method. - virtual views::View* GetInitiallyFocusedView() override; + views::View* GetInitiallyFocusedView() override; // views::WidgetDelegate method. - virtual void WindowClosing() override; + void WindowClosing() override; // views::View method. - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override; + bool AcceleratorPressed(const ui::Accelerator& accelerator) override; protected: // views::BubbleDelegateView method. - virtual void Init() override; + void Init() override; private: friend class BookmarkBubbleViewTest; @@ -76,15 +76,14 @@ class BookmarkBubbleView : public views::BubbleDelegateView, base::string16 GetTitle(); // Overridden from views::View: - virtual void GetAccessibleState(ui::AXViewState* state) override; + void GetAccessibleState(ui::AXViewState* state) override; // Overridden from views::ButtonListener: // Closes the bubble or opens the edit dialog. - virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) override; + void ButtonPressed(views::Button* sender, const ui::Event& event) override; // Overridden from views::ComboboxListener: - virtual void OnPerformAction(views::Combobox* combobox) override; + void OnPerformAction(views::Combobox* combobox) override; // Handle the message when the user presses a button. void HandleButtonPressed(views::Button* sender); diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc index e4d4c0d..c27b8e8 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc @@ -25,7 +25,7 @@ class BookmarkBubbleViewTest : public BrowserWithTestWindowTest { BookmarkBubbleViewTest() {} // testing::Test: - virtual void SetUp() override { + void SetUp() override { BrowserWithTestWindowTest::SetUp(); profile()->CreateBookmarkModel(true); @@ -37,7 +37,7 @@ class BookmarkBubbleViewTest : public BrowserWithTestWindowTest { bookmark_model, GURL(kTestBookmarkURL), base::string16()); } - virtual void TearDown() override { + void TearDown() override { // Make sure the bubble is destroyed before the profile to avoid a crash. bubble_.reset(); @@ -45,7 +45,7 @@ class BookmarkBubbleViewTest : public BrowserWithTestWindowTest { } // BrowserWithTestWindowTest: - virtual TestingProfile* CreateProfile() override { + TestingProfile* CreateProfile() override { TestingProfile::Builder builder; builder.AddTestingFactory(SigninManagerFactory::GetInstance(), FakeSigninManagerBase::Build); diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h index dc0b424..4631eaa 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h @@ -42,7 +42,7 @@ class BookmarkContextMenu : public BookmarkContextMenuControllerDelegate, const BookmarkNode* parent, const std::vector<const BookmarkNode*>& selection, bool close_on_remove); - virtual ~BookmarkContextMenu(); + ~BookmarkContextMenu() override; // Shows the context menu at the specified point. void RunMenuAt(const gfx::Point& point, @@ -58,18 +58,18 @@ class BookmarkContextMenu : public BookmarkContextMenuControllerDelegate, void SetPageNavigator(content::PageNavigator* navigator); // Overridden from views::MenuDelegate: - virtual void ExecuteCommand(int command_id, int event_flags) override; - virtual bool IsItemChecked(int command_id) const override; - virtual bool IsCommandEnabled(int command_id) const override; - virtual bool IsCommandVisible(int command_id) const override; - virtual bool ShouldCloseAllMenusOnExecute(int id) override; + void ExecuteCommand(int command_id, int event_flags) override; + bool IsItemChecked(int command_id) const override; + bool IsCommandEnabled(int command_id) const override; + bool IsCommandVisible(int command_id) const override; + bool ShouldCloseAllMenusOnExecute(int id) override; // Overridden from BookmarkContextMenuControllerDelegate: - virtual void CloseMenu() override; - virtual void WillExecuteCommand( + void CloseMenu() override; + void WillExecuteCommand( int command_id, const std::vector<const BookmarkNode*>& bookmarks) override; - virtual void DidExecuteCommand(int command_id) override; + void DidExecuteCommand(int command_id) override; private: scoped_ptr<BookmarkContextMenuController> controller_; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc index 06f2794..1178598 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc @@ -45,7 +45,7 @@ namespace { // PageNavigator implementation that records the URL. class TestingPageNavigator : public PageNavigator { public: - virtual WebContents* OpenURL(const OpenURLParams& params) override { + WebContents* OpenURL(const OpenURLParams& params) override { urls_.push_back(params.url); return NULL; } @@ -63,7 +63,7 @@ class BookmarkContextMenuTest : public testing::Test { model_(NULL) { } - virtual void SetUp() override { + void SetUp() override { event_source_ = ui::PlatformEventSource::CreateDefault(); profile_.reset(new TestingProfile()); profile_->CreateBookmarkModel(true); @@ -74,7 +74,7 @@ class BookmarkContextMenuTest : public testing::Test { AddTestData(); } - virtual void TearDown() override { + void TearDown() override { ui::Clipboard::DestroyClipboardForCurrentThread(); BrowserThread::GetBlockingPool()->FlushForTesting(); diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h index 5a4eeb3..ac56344 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h @@ -63,8 +63,8 @@ class BookmarkEditorView : public BookmarkEditor, explicit EditorTreeModel(EditorNode* root) : ui::TreeNodeModel<EditorNode>(root) {} - virtual void SetTitle(ui::TreeModelNode* node, - const base::string16& title) override; + void SetTitle(ui::TreeModelNode* node, + const base::string16& title) override; private: DISALLOW_COPY_AND_ASSIGN(EditorTreeModel); @@ -75,53 +75,49 @@ class BookmarkEditorView : public BookmarkEditor, const EditDetails& details, BookmarkEditor::Configuration configuration); - virtual ~BookmarkEditorView(); + ~BookmarkEditorView() override; // views::DialogDelegateView: - virtual base::string16 GetDialogButtonLabel( - ui::DialogButton button) const override; - virtual bool IsDialogButtonEnabled(ui::DialogButton button) const override; - virtual views::View* CreateExtraView() override; - virtual ui::ModalType GetModalType() const override; - virtual bool CanResize() const override; - virtual base::string16 GetWindowTitle() const override; - virtual bool Accept() override; + base::string16 GetDialogButtonLabel(ui::DialogButton button) const override; + bool IsDialogButtonEnabled(ui::DialogButton button) const override; + views::View* CreateExtraView() override; + ui::ModalType GetModalType() const override; + bool CanResize() const override; + base::string16 GetWindowTitle() const override; + bool Accept() override; // views::View: - virtual gfx::Size GetPreferredSize() const override; - virtual void GetAccessibleState(ui::AXViewState* state) override; + gfx::Size GetPreferredSize() const override; + void GetAccessibleState(ui::AXViewState* state) override; // views::TreeViewController: - virtual void OnTreeViewSelectionChanged(views::TreeView* tree_view) override; - virtual bool CanEdit(views::TreeView* tree_view, - ui::TreeModelNode* node) override; + void OnTreeViewSelectionChanged(views::TreeView* tree_view) override; + bool CanEdit(views::TreeView* tree_view, ui::TreeModelNode* node) override; // views::TextfieldController: - virtual void ContentsChanged(views::Textfield* sender, - const base::string16& new_contents) override; - virtual bool HandleKeyEvent(views::Textfield* sender, - const ui::KeyEvent& key_event) override; + void ContentsChanged(views::Textfield* sender, + const base::string16& new_contents) override; + bool HandleKeyEvent(views::Textfield* sender, + const ui::KeyEvent& key_event) override; // views::ButtonListener: - virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) override; + void ButtonPressed(views::Button* sender, const ui::Event& event) override; // ui::SimpleMenuModel::Delegate: - virtual bool IsCommandIdChecked(int command_id) const override; - virtual bool IsCommandIdEnabled(int command_id) const override; - virtual bool GetAcceleratorForCommandId( - int command_id, - ui::Accelerator* accelerator) override; - virtual void ExecuteCommand(int command_id, int event_flags) override; + bool IsCommandIdChecked(int command_id) const override; + bool IsCommandIdEnabled(int command_id) const override; + bool GetAcceleratorForCommandId(int command_id, + ui::Accelerator* accelerator) override; + void ExecuteCommand(int command_id, int event_flags) override; // Creates a Window and adds the BookmarkEditorView to it. When the window is // closed the BookmarkEditorView is deleted. void Show(gfx::NativeWindow parent); // views::ContextMenuController: - virtual void ShowContextMenuForView(views::View* source, - const gfx::Point& point, - ui::MenuSourceType source_type) override; + void ShowContextMenuForView(views::View* source, + const gfx::Point& point, + ui::MenuSourceType source_type) override; private: friend class BookmarkEditorViewTest; @@ -132,30 +128,29 @@ class BookmarkEditorView : public BookmarkEditor, // BookmarkModel observer methods. Any structural change results in // resetting the tree model. - virtual void BookmarkModelLoaded(BookmarkModel* model, - bool ids_reassigned) override {} - virtual void BookmarkNodeMoved(BookmarkModel* model, - const BookmarkNode* old_parent, - int old_index, - const BookmarkNode* new_parent, - int new_index) override; - virtual void BookmarkNodeAdded(BookmarkModel* model, - const BookmarkNode* parent, - int index) override; - virtual void BookmarkNodeRemoved(BookmarkModel* model, - const BookmarkNode* parent, - int index, - const BookmarkNode* node, + void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override { + } + void BookmarkNodeMoved(BookmarkModel* model, + const BookmarkNode* old_parent, + int old_index, + const BookmarkNode* new_parent, + int new_index) override; + void BookmarkNodeAdded(BookmarkModel* model, + const BookmarkNode* parent, + int index) override; + void BookmarkNodeRemoved(BookmarkModel* model, + const BookmarkNode* parent, + int index, + const BookmarkNode* node, + const std::set<GURL>& removed_urls) override; + void BookmarkAllUserNodesRemoved(BookmarkModel* model, const std::set<GURL>& removed_urls) override; - virtual void BookmarkAllUserNodesRemoved( - BookmarkModel* model, - const std::set<GURL>& removed_urls) override; - virtual void BookmarkNodeChanged(BookmarkModel* model, - const BookmarkNode* node) override {} - virtual void BookmarkNodeChildrenReordered(BookmarkModel* model, - const BookmarkNode* node) override; - virtual void BookmarkNodeFaviconChanged(BookmarkModel* model, - const BookmarkNode* node) override {} + void BookmarkNodeChanged(BookmarkModel* model, + const BookmarkNode* node) override {} + void BookmarkNodeChildrenReordered(BookmarkModel* model, + const BookmarkNode* node) override; + void BookmarkNodeFaviconChanged(BookmarkModel* model, + const BookmarkNode* node) override {} // Resets the model of the tree and updates the various buttons appropriately. void Reset(); diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc index 6f74b09..e428f13 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc @@ -35,7 +35,7 @@ class BookmarkEditorViewTest : public testing::Test { model_(NULL) { } - virtual void SetUp() { + void SetUp() override { profile_.reset(new TestingProfile()); profile_->CreateBookmarkModel(true); @@ -45,8 +45,7 @@ class BookmarkEditorViewTest : public testing::Test { AddTestData(); } - virtual void TearDown() { - } + void TearDown() override {} protected: std::string base_path() const { return "file:///c:/tmp/"; } diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h index 9c7f07e..fa8dbaf 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h @@ -75,50 +75,47 @@ class BookmarkMenuController : public BaseBookmarkModelObserver, } // views::MenuDelegate: - virtual base::string16 GetTooltipText(int id, - const gfx::Point& p) const override; - virtual bool IsTriggerableEvent(views::MenuItemView* view, - const ui::Event& e) override; - virtual void ExecuteCommand(int id, int mouse_event_flags) override; - virtual bool ShouldExecuteCommandWithoutClosingMenu( - int id, - const ui::Event& e) override; - virtual bool GetDropFormats( + base::string16 GetTooltipText(int id, const gfx::Point& p) const override; + bool IsTriggerableEvent(views::MenuItemView* view, + const ui::Event& e) override; + void ExecuteCommand(int id, int mouse_event_flags) override; + bool ShouldExecuteCommandWithoutClosingMenu(int id, + const ui::Event& e) override; + bool GetDropFormats( views::MenuItemView* menu, int* formats, std::set<ui::OSExchangeData::CustomFormat>* custom_formats) override; - virtual bool AreDropTypesRequired(views::MenuItemView* menu) override; - virtual bool CanDrop(views::MenuItemView* menu, - const ui::OSExchangeData& data) override; - virtual int GetDropOperation(views::MenuItemView* item, - const ui::DropTargetEvent& event, - DropPosition* position) override; - virtual int OnPerformDrop(views::MenuItemView* menu, - DropPosition position, - const ui::DropTargetEvent& event) override; - virtual bool ShowContextMenu(views::MenuItemView* source, - int id, - const gfx::Point& p, - ui::MenuSourceType source_type) override; - virtual void DropMenuClosed(views::MenuItemView* menu) override; - virtual bool CanDrag(views::MenuItemView* menu) override; - virtual void WriteDragData(views::MenuItemView* sender, - ui::OSExchangeData* data) override; - virtual int GetDragOperations(views::MenuItemView* sender) override; - virtual views::MenuItemView* GetSiblingMenu( - views::MenuItemView* menu, - const gfx::Point& screen_point, - views::MenuAnchorPosition* anchor, - bool* has_mnemonics, - views::MenuButton** button) override; - virtual int GetMaxWidthForMenu(views::MenuItemView* view) override; + bool AreDropTypesRequired(views::MenuItemView* menu) override; + bool CanDrop(views::MenuItemView* menu, + const ui::OSExchangeData& data) override; + int GetDropOperation(views::MenuItemView* item, + const ui::DropTargetEvent& event, + DropPosition* position) override; + int OnPerformDrop(views::MenuItemView* menu, + DropPosition position, + const ui::DropTargetEvent& event) override; + bool ShowContextMenu(views::MenuItemView* source, + int id, + const gfx::Point& p, + ui::MenuSourceType source_type) override; + void DropMenuClosed(views::MenuItemView* menu) override; + bool CanDrag(views::MenuItemView* menu) override; + void WriteDragData(views::MenuItemView* sender, + ui::OSExchangeData* data) override; + int GetDragOperations(views::MenuItemView* sender) override; + views::MenuItemView* GetSiblingMenu(views::MenuItemView* menu, + const gfx::Point& screen_point, + views::MenuAnchorPosition* anchor, + bool* has_mnemonics, + views::MenuButton** button) override; + int GetMaxWidthForMenu(views::MenuItemView* view) override; // BaseBookmarkModelObserver: - virtual void BookmarkModelChanged() override; + void BookmarkModelChanged() override; private: // BookmarkMenuController deletes itself as necessary. - virtual ~BookmarkMenuController(); + ~BookmarkMenuController() override; scoped_ptr<views::MenuRunner> menu_runner_; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h index 6a2a5cf..a59faf9 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h @@ -56,7 +56,7 @@ class BookmarkMenuDelegate : public BaseBookmarkModelObserver, views::Widget* parent, int first_menu_id, int max_menu_id); - virtual ~BookmarkMenuDelegate(); + ~BookmarkMenuDelegate() override; // Creates the menus from the model. void Init(views::MenuDelegate* real_delegate, @@ -122,14 +122,14 @@ class BookmarkMenuDelegate : public BaseBookmarkModelObserver, int GetMaxWidthForMenu(views::MenuItemView* menu); // BookmarkModelObserver methods. - virtual void BookmarkModelChanged() override; - virtual void BookmarkNodeFaviconChanged(BookmarkModel* model, - const BookmarkNode* node) override; + void BookmarkModelChanged() override; + void BookmarkNodeFaviconChanged(BookmarkModel* model, + const BookmarkNode* node) override; // BookmarkContextMenu::Observer methods. - virtual void WillRemoveBookmarks( + void WillRemoveBookmarks( const std::vector<const BookmarkNode*>& bookmarks) override; - virtual void DidRemoveBookmarks() override; + void DidRemoveBookmarks() override; private: typedef std::map<int, const BookmarkNode*> MenuIDToNodeMap; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc index aa9a559..6ec2fb6 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc @@ -22,7 +22,7 @@ class BookmarkMenuDelegateTest : public BrowserWithTestWindowTest { public: BookmarkMenuDelegateTest() : model_(NULL) {} - virtual void SetUp() override { + void SetUp() override { BrowserWithTestWindowTest::SetUp(); profile()->CreateBookmarkModel(true); @@ -33,7 +33,7 @@ class BookmarkMenuDelegateTest : public BrowserWithTestWindowTest { AddTestData(); } - virtual void TearDown() override { + void TearDown() override { if (bookmark_menu_delegate_.get()) { // Since we never show the menu we need to pass the MenuItemView to // MenuRunner so that the MenuItemView is destroyed. diff --git a/chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view.h b/chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view.h index 9bdadef..7d106d8 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view.h @@ -21,8 +21,8 @@ class BookmarkSyncPromoView : public views::StyledLabelListener, private: // views::StyledLabelListener: - virtual void StyledLabelLinkClicked(const gfx::Range& range, - int event_flags) override; + void StyledLabelLinkClicked(const gfx::Range& range, + int event_flags) override; // Delegate, to handle clicks on the sign in link. BookmarkBubbleDelegate* delegate_; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view_unittest.cc index a3bca77..4d08179 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view_unittest.cc @@ -19,9 +19,7 @@ class BookmarkSyncPromoViewTest : public BookmarkBubbleDelegate, protected: // BookmarkBubbleDelegate: - virtual void OnSignInLinkClicked() override { - ++sign_in_clicked_count_; - } + void OnSignInLinkClicked() override { ++sign_in_clicked_count_; } // Number of times that OnSignInLinkClicked has been called. int sign_in_clicked_count_; |