Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1022)

Unified Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h

Issue 671653002: Standardize usage of virtual/override/final in chrome/browser/ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
index 202ba95537709c8ac9feab243fcb1090f26ff0b0..3d5898b44cc09ddde8fd3656e27119a9b742d9ad 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
@@ -53,38 +53,38 @@ class LocationBarViewMac : public LocationBar,
CommandUpdater* command_updater,
Profile* profile,
Browser* browser);
- virtual ~LocationBarViewMac();
+ ~LocationBarViewMac() override;
// Overridden from LocationBar:
- virtual void ShowFirstRunBubble() override;
- virtual GURL GetDestinationURL() const override;
- virtual WindowOpenDisposition GetWindowOpenDisposition() const override;
- virtual ui::PageTransition GetPageTransition() const override;
- virtual void AcceptInput() override;
- virtual void FocusLocation(bool select_all) override;
- virtual void FocusSearch() override;
- virtual void UpdateContentSettingsIcons() override;
- virtual void UpdateManagePasswordsIconAndBubble() override;
- virtual void UpdatePageActions() override;
- virtual void InvalidatePageActions() override;
- virtual void UpdateBookmarkStarVisibility() override;
- virtual bool ShowPageActionPopup(const extensions::Extension* extension,
- bool grant_active_tab) override;
- virtual void UpdateOpenPDFInReaderPrompt() override;
- virtual void UpdateGeneratedCreditCardView() override;
- virtual void SaveStateToContents(content::WebContents* contents) override;
- virtual void Revert() override;
- virtual const OmniboxView* GetOmniboxView() const override;
- virtual OmniboxView* GetOmniboxView() override;
- virtual LocationBarTesting* GetLocationBarForTesting() override;
+ void ShowFirstRunBubble() override;
+ GURL GetDestinationURL() const override;
+ WindowOpenDisposition GetWindowOpenDisposition() const override;
+ ui::PageTransition GetPageTransition() const override;
+ void AcceptInput() override;
+ void FocusLocation(bool select_all) override;
+ void FocusSearch() override;
+ void UpdateContentSettingsIcons() override;
+ void UpdateManagePasswordsIconAndBubble() override;
+ void UpdatePageActions() override;
+ void InvalidatePageActions() override;
+ void UpdateBookmarkStarVisibility() override;
+ bool ShowPageActionPopup(const extensions::Extension* extension,
+ bool grant_active_tab) override;
+ void UpdateOpenPDFInReaderPrompt() override;
+ void UpdateGeneratedCreditCardView() override;
+ void SaveStateToContents(content::WebContents* contents) override;
+ void Revert() override;
+ const OmniboxView* GetOmniboxView() const override;
+ OmniboxView* GetOmniboxView() override;
+ LocationBarTesting* GetLocationBarForTesting() override;
// Overridden from LocationBarTesting:
- virtual int PageActionCount() override;
- virtual int PageActionVisibleCount() override;
- virtual ExtensionAction* GetPageAction(size_t index) override;
- virtual ExtensionAction* GetVisiblePageAction(size_t index) override;
- virtual void TestPageActionPressed(size_t index) override;
- virtual bool GetBookmarkStarVisibility() override;
+ int PageActionCount() override;
+ int PageActionVisibleCount() override;
+ ExtensionAction* GetPageAction(size_t index) override;
+ ExtensionAction* GetVisiblePageAction(size_t index) override;
+ void TestPageActionPressed(size_t index) override;
+ bool GetBookmarkStarVisibility() override;
// Set/Get the editable state of the field.
void SetEditable(bool editable);
@@ -154,15 +154,15 @@ class LocationBarViewMac : public LocationBar,
NSPoint GetPageActionBubblePoint(ExtensionAction* page_action);
// OmniboxEditController:
- virtual void Update(const content::WebContents* contents) override;
- virtual void OnChanged() override;
- virtual void OnSetFocus() override;
- virtual void ShowURL() override;
- virtual void EndOriginChipAnimations(bool cancel_fade) override;
- virtual InstantController* GetInstant() override;
- virtual content::WebContents* GetWebContents() override;
- virtual ToolbarModel* GetToolbarModel() override;
- virtual const ToolbarModel* GetToolbarModel() const override;
+ void Update(const content::WebContents* contents) override;
+ void OnChanged() override;
+ void OnSetFocus() override;
+ void ShowURL() override;
+ void EndOriginChipAnimations(bool cancel_fade) override;
+ InstantController* GetInstant() override;
+ content::WebContents* GetWebContents() override;
+ ToolbarModel* GetToolbarModel() override;
+ const ToolbarModel* GetToolbarModel() const override;
NSImage* GetKeywordImage(const base::string16& keyword);
@@ -173,14 +173,14 @@ class LocationBarViewMac : public LocationBar,
}
// SearchModelObserver:
- virtual void ModelChanged(const SearchModel::State& old_state,
- const SearchModel::State& new_state) override;
+ void ModelChanged(const SearchModel::State& old_state,
+ const SearchModel::State& new_state) override;
Browser* browser() const { return browser_; }
protected:
// OmniboxEditController:
- virtual void HideURL() override;
+ void HideURL() override;
private:
friend ZoomDecorationTest;

Powered by Google App Engine
This is Rietveld 408576698