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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_cocoa.h

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
7 7
8 #include "base/mac/scoped_nsobject.h" 8 #include "base/mac/scoped_nsobject.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "chrome/browser/extensions/extension_keybinding_registry.h" 10 #include "chrome/browser/extensions/extension_keybinding_registry.h"
(...skipping 23 matching lines...) Expand all
34 class BrowserWindowCocoa : 34 class BrowserWindowCocoa :
35 public BrowserWindow, 35 public BrowserWindow,
36 public extensions::ExtensionKeybindingRegistry::Delegate, 36 public extensions::ExtensionKeybindingRegistry::Delegate,
37 public SearchModelObserver { 37 public SearchModelObserver {
38 public: 38 public:
39 BrowserWindowCocoa(Browser* browser, 39 BrowserWindowCocoa(Browser* browser,
40 BrowserWindowController* controller); 40 BrowserWindowController* controller);
41 virtual ~BrowserWindowCocoa(); 41 virtual ~BrowserWindowCocoa();
42 42
43 // Overridden from BrowserWindow 43 // Overridden from BrowserWindow
44 virtual void Show() OVERRIDE; 44 virtual void Show() override;
45 virtual void ShowInactive() OVERRIDE; 45 virtual void ShowInactive() override;
46 virtual void Hide() OVERRIDE; 46 virtual void Hide() override;
47 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; 47 virtual void SetBounds(const gfx::Rect& bounds) override;
48 virtual void Close() OVERRIDE; 48 virtual void Close() override;
49 virtual void Activate() OVERRIDE; 49 virtual void Activate() override;
50 virtual void Deactivate() OVERRIDE; 50 virtual void Deactivate() override;
51 virtual bool IsActive() const OVERRIDE; 51 virtual bool IsActive() const override;
52 virtual void FlashFrame(bool flash) OVERRIDE; 52 virtual void FlashFrame(bool flash) override;
53 virtual bool IsAlwaysOnTop() const OVERRIDE; 53 virtual bool IsAlwaysOnTop() const override;
54 virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE; 54 virtual void SetAlwaysOnTop(bool always_on_top) override;
55 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE; 55 virtual gfx::NativeWindow GetNativeWindow() override;
56 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE; 56 virtual BrowserWindowTesting* GetBrowserWindowTesting() override;
57 virtual StatusBubble* GetStatusBubble() OVERRIDE; 57 virtual StatusBubble* GetStatusBubble() override;
58 virtual void UpdateTitleBar() OVERRIDE; 58 virtual void UpdateTitleBar() override;
59 virtual void BookmarkBarStateChanged( 59 virtual void BookmarkBarStateChanged(
60 BookmarkBar::AnimateChangeType change_type) OVERRIDE; 60 BookmarkBar::AnimateChangeType change_type) override;
61 virtual void UpdateDevTools() OVERRIDE; 61 virtual void UpdateDevTools() override;
62 virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE; 62 virtual void UpdateLoadingAnimations(bool should_animate) override;
63 virtual void SetStarredState(bool is_starred) OVERRIDE; 63 virtual void SetStarredState(bool is_starred) override;
64 virtual void SetTranslateIconToggled(bool is_lit) OVERRIDE; 64 virtual void SetTranslateIconToggled(bool is_lit) override;
65 virtual void OnActiveTabChanged(content::WebContents* old_contents, 65 virtual void OnActiveTabChanged(content::WebContents* old_contents,
66 content::WebContents* new_contents, 66 content::WebContents* new_contents,
67 int index, 67 int index,
68 int reason) OVERRIDE; 68 int reason) override;
69 virtual void ZoomChangedForActiveTab(bool can_show_bubble) OVERRIDE; 69 virtual void ZoomChangedForActiveTab(bool can_show_bubble) override;
70 virtual gfx::Rect GetRestoredBounds() const OVERRIDE; 70 virtual gfx::Rect GetRestoredBounds() const override;
71 virtual ui::WindowShowState GetRestoredState() const OVERRIDE; 71 virtual ui::WindowShowState GetRestoredState() const override;
72 virtual gfx::Rect GetBounds() const OVERRIDE; 72 virtual gfx::Rect GetBounds() const override;
73 virtual bool IsMaximized() const OVERRIDE; 73 virtual bool IsMaximized() const override;
74 virtual bool IsMinimized() const OVERRIDE; 74 virtual bool IsMinimized() const override;
75 virtual void Maximize() OVERRIDE; 75 virtual void Maximize() override;
76 virtual void Minimize() OVERRIDE; 76 virtual void Minimize() override;
77 virtual void Restore() OVERRIDE; 77 virtual void Restore() override;
78 virtual void EnterFullscreen( 78 virtual void EnterFullscreen(
79 const GURL& url, FullscreenExitBubbleType type) OVERRIDE; 79 const GURL& url, FullscreenExitBubbleType type) override;
80 virtual void ExitFullscreen() OVERRIDE; 80 virtual void ExitFullscreen() override;
81 virtual void UpdateFullscreenExitBubbleContent( 81 virtual void UpdateFullscreenExitBubbleContent(
82 const GURL& url, 82 const GURL& url,
83 FullscreenExitBubbleType bubble_type) OVERRIDE; 83 FullscreenExitBubbleType bubble_type) override;
84 virtual bool ShouldHideUIForFullscreen() const OVERRIDE; 84 virtual bool ShouldHideUIForFullscreen() const override;
85 virtual bool IsFullscreen() const OVERRIDE; 85 virtual bool IsFullscreen() const override;
86 virtual bool IsFullscreenBubbleVisible() const OVERRIDE; 86 virtual bool IsFullscreenBubbleVisible() const override;
87 virtual LocationBar* GetLocationBar() const OVERRIDE; 87 virtual LocationBar* GetLocationBar() const override;
88 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE; 88 virtual void SetFocusToLocationBar(bool select_all) override;
89 virtual void UpdateReloadStopState(bool is_loading, bool force) OVERRIDE; 89 virtual void UpdateReloadStopState(bool is_loading, bool force) override;
90 virtual void UpdateToolbar(content::WebContents* contents) OVERRIDE; 90 virtual void UpdateToolbar(content::WebContents* contents) override;
91 virtual void FocusToolbar() OVERRIDE; 91 virtual void FocusToolbar() override;
92 virtual void FocusAppMenu() OVERRIDE; 92 virtual void FocusAppMenu() override;
93 virtual void FocusBookmarksToolbar() OVERRIDE; 93 virtual void FocusBookmarksToolbar() override;
94 virtual void FocusInfobars() OVERRIDE; 94 virtual void FocusInfobars() override;
95 virtual void RotatePaneFocus(bool forwards) OVERRIDE; 95 virtual void RotatePaneFocus(bool forwards) override;
96 virtual bool IsBookmarkBarVisible() const OVERRIDE; 96 virtual bool IsBookmarkBarVisible() const override;
97 virtual bool IsBookmarkBarAnimating() const OVERRIDE; 97 virtual bool IsBookmarkBarAnimating() const override;
98 virtual bool IsTabStripEditable() const OVERRIDE; 98 virtual bool IsTabStripEditable() const override;
99 virtual bool IsToolbarVisible() const OVERRIDE; 99 virtual bool IsToolbarVisible() const override;
100 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; 100 virtual gfx::Rect GetRootWindowResizerRect() const override;
101 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, 101 virtual void ConfirmAddSearchProvider(TemplateURL* template_url,
102 Profile* profile) OVERRIDE; 102 Profile* profile) override;
103 virtual void ShowUpdateChromeDialog() OVERRIDE; 103 virtual void ShowUpdateChromeDialog() override;
104 virtual void ShowBookmarkBubble(const GURL& url, 104 virtual void ShowBookmarkBubble(const GURL& url,
105 bool already_bookmarked) OVERRIDE; 105 bool already_bookmarked) override;
106 virtual void ShowBookmarkAppBubble( 106 virtual void ShowBookmarkAppBubble(
107 const WebApplicationInfo& web_app_info, 107 const WebApplicationInfo& web_app_info,
108 const std::string& extension_id) OVERRIDE; 108 const std::string& extension_id) override;
109 virtual void ShowTranslateBubble( 109 virtual void ShowTranslateBubble(
110 content::WebContents* contents, 110 content::WebContents* contents,
111 translate::TranslateStep step, 111 translate::TranslateStep step,
112 translate::TranslateErrors::Type error_type, 112 translate::TranslateErrors::Type error_type,
113 bool is_user_gesture) OVERRIDE; 113 bool is_user_gesture) override;
114 #if defined(ENABLE_ONE_CLICK_SIGNIN) 114 #if defined(ENABLE_ONE_CLICK_SIGNIN)
115 virtual void ShowOneClickSigninBubble( 115 virtual void ShowOneClickSigninBubble(
116 OneClickSigninBubbleType type, 116 OneClickSigninBubbleType type,
117 const base::string16& email, 117 const base::string16& email,
118 const base::string16& error_message, 118 const base::string16& error_message,
119 const StartSyncCallback& start_sync_callback) OVERRIDE; 119 const StartSyncCallback& start_sync_callback) override;
120 #endif 120 #endif
121 virtual bool IsDownloadShelfVisible() const OVERRIDE; 121 virtual bool IsDownloadShelfVisible() const override;
122 virtual DownloadShelf* GetDownloadShelf() OVERRIDE; 122 virtual DownloadShelf* GetDownloadShelf() override;
123 virtual void ConfirmBrowserCloseWithPendingDownloads( 123 virtual void ConfirmBrowserCloseWithPendingDownloads(
124 int download_count, 124 int download_count,
125 Browser::DownloadClosePreventionType dialog_type, 125 Browser::DownloadClosePreventionType dialog_type,
126 bool app_modal, 126 bool app_modal,
127 const base::Callback<void(bool)>& callback) OVERRIDE; 127 const base::Callback<void(bool)>& callback) override;
128 virtual void UserChangedTheme() OVERRIDE; 128 virtual void UserChangedTheme() override;
129 virtual int GetExtraRenderViewHeight() const OVERRIDE; 129 virtual int GetExtraRenderViewHeight() const override;
130 virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE; 130 virtual void WebContentsFocused(content::WebContents* contents) override;
131 virtual void ShowWebsiteSettings(Profile* profile, 131 virtual void ShowWebsiteSettings(Profile* profile,
132 content::WebContents* web_contents, 132 content::WebContents* web_contents,
133 const GURL& url, 133 const GURL& url,
134 const content::SSLStatus& ssl) OVERRIDE; 134 const content::SSLStatus& ssl) override;
135 virtual void ShowAppMenu() OVERRIDE; 135 virtual void ShowAppMenu() override;
136 virtual bool PreHandleKeyboardEvent( 136 virtual bool PreHandleKeyboardEvent(
137 const content::NativeWebKeyboardEvent& event, 137 const content::NativeWebKeyboardEvent& event,
138 bool* is_keyboard_shortcut) OVERRIDE; 138 bool* is_keyboard_shortcut) override;
139 virtual void HandleKeyboardEvent( 139 virtual void HandleKeyboardEvent(
140 const content::NativeWebKeyboardEvent& event) OVERRIDE; 140 const content::NativeWebKeyboardEvent& event) override;
141 virtual void Cut() OVERRIDE; 141 virtual void Cut() override;
142 virtual void Copy() OVERRIDE; 142 virtual void Copy() override;
143 virtual void Paste() OVERRIDE; 143 virtual void Paste() override;
144 virtual void EnterFullscreenWithChrome() OVERRIDE; 144 virtual void EnterFullscreenWithChrome() override;
145 virtual bool IsFullscreenWithChrome() OVERRIDE; 145 virtual bool IsFullscreenWithChrome() override;
146 virtual bool IsFullscreenWithoutChrome() OVERRIDE; 146 virtual bool IsFullscreenWithoutChrome() override;
147 virtual WindowOpenDisposition GetDispositionForPopupBounds( 147 virtual WindowOpenDisposition GetDispositionForPopupBounds(
148 const gfx::Rect& bounds) OVERRIDE; 148 const gfx::Rect& bounds) override;
149 virtual FindBar* CreateFindBar() OVERRIDE; 149 virtual FindBar* CreateFindBar() override;
150 virtual web_modal::WebContentsModalDialogHost* 150 virtual web_modal::WebContentsModalDialogHost*
151 GetWebContentsModalDialogHost() OVERRIDE; 151 GetWebContentsModalDialogHost() override;
152 virtual void ShowAvatarBubble(content::WebContents* web_contents, 152 virtual void ShowAvatarBubble(content::WebContents* web_contents,
153 const gfx::Rect& rect) OVERRIDE; 153 const gfx::Rect& rect) override;
154 virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode, 154 virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode,
155 const signin::ManageAccountsParams& manage_accounts_params) OVERRIDE; 155 const signin::ManageAccountsParams& manage_accounts_params) override;
156 virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() OVERRIDE; 156 virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() override;
157 virtual void ExecuteExtensionCommand( 157 virtual void ExecuteExtensionCommand(
158 const extensions::Extension* extension, 158 const extensions::Extension* extension,
159 const extensions::Command& command) OVERRIDE; 159 const extensions::Command& command) override;
160 160
161 // Overridden from ExtensionKeybindingRegistry::Delegate: 161 // Overridden from ExtensionKeybindingRegistry::Delegate:
162 virtual extensions::ActiveTabPermissionGranter* 162 virtual extensions::ActiveTabPermissionGranter*
163 GetActiveTabPermissionGranter() OVERRIDE; 163 GetActiveTabPermissionGranter() override;
164 164
165 // Overridden from SearchModelObserver: 165 // Overridden from SearchModelObserver:
166 virtual void ModelChanged(const SearchModel::State& old_state, 166 virtual void ModelChanged(const SearchModel::State& old_state,
167 const SearchModel::State& new_state) OVERRIDE; 167 const SearchModel::State& new_state) override;
168 168
169 // Adds the given FindBar cocoa controller to this browser window. 169 // Adds the given FindBar cocoa controller to this browser window.
170 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); 170 void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller);
171 171
172 // Returns the cocoa-world BrowserWindowController 172 // Returns the cocoa-world BrowserWindowController
173 BrowserWindowController* cocoa_controller() { return controller_; } 173 BrowserWindowController* cocoa_controller() { return controller_; }
174 174
175 protected: 175 protected:
176 virtual void DestroyBrowser() OVERRIDE; 176 virtual void DestroyBrowser() override;
177 177
178 private: 178 private:
179 NSWindow* window() const; // Accessor for the (current) |NSWindow|. 179 NSWindow* window() const; // Accessor for the (current) |NSWindow|.
180 180
181 Browser* browser_; // weak, owned by controller 181 Browser* browser_; // weak, owned by controller
182 BrowserWindowController* controller_; // weak, owns us 182 BrowserWindowController* controller_; // weak, owns us
183 base::scoped_nsobject<NSString> pending_window_title_; 183 base::scoped_nsobject<NSString> pending_window_title_;
184 ui::WindowShowState initial_show_state_; 184 ui::WindowShowState initial_show_state_;
185 NSInteger attention_request_id_; // identifier from requestUserAttention 185 NSInteger attention_request_id_; // identifier from requestUserAttention
186 }; 186 };
187 187
188 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_ 188 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_COCOA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698