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

Side by Side Diff: content/shell/browser/shell.h

Issue 629143003: Replace OVERRIDE and FINAL with override and final in content/shell/[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
« no previous file with comments | « content/shell/browser/notify_done_forwarder.h ('k') | content/shell/browser/shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CONTENT_SHELL_BROWSER_SHELL_H_ 4 #ifndef CONTENT_SHELL_BROWSER_SHELL_H_
5 #define CONTENT_SHELL_BROWSER_SHELL_H_ 5 #define CONTENT_SHELL_BROWSER_SHELL_H_
6 6
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 // Public to be called by an ObjC bridge object. 107 // Public to be called by an ObjC bridge object.
108 void ActionPerformed(int control); 108 void ActionPerformed(int control);
109 void URLEntered(std::string url_string); 109 void URLEntered(std::string url_string);
110 #elif defined(OS_ANDROID) 110 #elif defined(OS_ANDROID)
111 // Registers the Android Java to native methods. 111 // Registers the Android Java to native methods.
112 static bool Register(JNIEnv* env); 112 static bool Register(JNIEnv* env);
113 #endif 113 #endif
114 114
115 // WebContentsDelegate 115 // WebContentsDelegate
116 virtual WebContents* OpenURLFromTab(WebContents* source, 116 virtual WebContents* OpenURLFromTab(WebContents* source,
117 const OpenURLParams& params) OVERRIDE; 117 const OpenURLParams& params) override;
118 virtual void AddNewContents(WebContents* source, 118 virtual void AddNewContents(WebContents* source,
119 WebContents* new_contents, 119 WebContents* new_contents,
120 WindowOpenDisposition disposition, 120 WindowOpenDisposition disposition,
121 const gfx::Rect& initial_pos, 121 const gfx::Rect& initial_pos,
122 bool user_gesture, 122 bool user_gesture,
123 bool* was_blocked) OVERRIDE; 123 bool* was_blocked) override;
124 virtual void LoadingStateChanged(WebContents* source, 124 virtual void LoadingStateChanged(WebContents* source,
125 bool to_different_document) OVERRIDE; 125 bool to_different_document) override;
126 #if defined(OS_ANDROID) 126 #if defined(OS_ANDROID)
127 virtual void LoadProgressChanged(WebContents* source, 127 virtual void LoadProgressChanged(WebContents* source,
128 double progress) OVERRIDE; 128 double progress) override;
129 #endif 129 #endif
130 virtual void ToggleFullscreenModeForTab(WebContents* web_contents, 130 virtual void ToggleFullscreenModeForTab(WebContents* web_contents,
131 bool enter_fullscreen) OVERRIDE; 131 bool enter_fullscreen) override;
132 virtual bool IsFullscreenForTabOrPending( 132 virtual bool IsFullscreenForTabOrPending(
133 const WebContents* web_contents) const OVERRIDE; 133 const WebContents* web_contents) const override;
134 virtual void RequestToLockMouse(WebContents* web_contents, 134 virtual void RequestToLockMouse(WebContents* web_contents,
135 bool user_gesture, 135 bool user_gesture,
136 bool last_unlocked_by_target) OVERRIDE; 136 bool last_unlocked_by_target) override;
137 virtual void CloseContents(WebContents* source) OVERRIDE; 137 virtual void CloseContents(WebContents* source) override;
138 virtual bool CanOverscrollContent() const OVERRIDE; 138 virtual bool CanOverscrollContent() const override;
139 virtual void DidNavigateMainFramePostCommit( 139 virtual void DidNavigateMainFramePostCommit(
140 WebContents* web_contents) OVERRIDE; 140 WebContents* web_contents) override;
141 virtual JavaScriptDialogManager* GetJavaScriptDialogManager() OVERRIDE; 141 virtual JavaScriptDialogManager* GetJavaScriptDialogManager() override;
142 #if defined(OS_MACOSX) 142 #if defined(OS_MACOSX)
143 virtual void HandleKeyboardEvent( 143 virtual void HandleKeyboardEvent(
144 WebContents* source, 144 WebContents* source,
145 const NativeWebKeyboardEvent& event) OVERRIDE; 145 const NativeWebKeyboardEvent& event) override;
146 #endif 146 #endif
147 virtual bool AddMessageToConsole(WebContents* source, 147 virtual bool AddMessageToConsole(WebContents* source,
148 int32 level, 148 int32 level,
149 const base::string16& message, 149 const base::string16& message,
150 int32 line_no, 150 int32 line_no,
151 const base::string16& source_id) OVERRIDE; 151 const base::string16& source_id) override;
152 virtual void RendererUnresponsive(WebContents* source) OVERRIDE; 152 virtual void RendererUnresponsive(WebContents* source) override;
153 virtual void ActivateContents(WebContents* contents) OVERRIDE; 153 virtual void ActivateContents(WebContents* contents) override;
154 virtual void DeactivateContents(WebContents* contents) OVERRIDE; 154 virtual void DeactivateContents(WebContents* contents) override;
155 virtual void WorkerCrashed(WebContents* source) OVERRIDE; 155 virtual void WorkerCrashed(WebContents* source) override;
156 virtual bool HandleContextMenu(const content::ContextMenuParams& params) 156 virtual bool HandleContextMenu(const content::ContextMenuParams& params)
157 OVERRIDE; 157 override;
158 virtual void WebContentsFocused(WebContents* contents) OVERRIDE; 158 virtual void WebContentsFocused(WebContents* contents) override;
159 159
160 private: 160 private:
161 enum UIControl { 161 enum UIControl {
162 BACK_BUTTON, 162 BACK_BUTTON,
163 FORWARD_BUTTON, 163 FORWARD_BUTTON,
164 STOP_BUTTON 164 STOP_BUTTON
165 }; 165 };
166 166
167 class DevToolsWebContentsObserver; 167 class DevToolsWebContentsObserver;
168 168
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 bool PlatformIsFullscreenForTabOrPending( 207 bool PlatformIsFullscreenForTabOrPending(
208 const WebContents* web_contents) const; 208 const WebContents* web_contents) const;
209 #endif 209 #endif
210 #if defined(TOOLKIT_VIEWS) 210 #if defined(TOOLKIT_VIEWS)
211 void PlatformWebContentsFocused(WebContents* contents); 211 void PlatformWebContentsFocused(WebContents* contents);
212 #endif 212 #endif
213 213
214 gfx::NativeView GetContentView(); 214 gfx::NativeView GetContentView();
215 215
216 // WebContentsObserver 216 // WebContentsObserver
217 virtual void TitleWasSet(NavigationEntry* entry, bool explicit_set) OVERRIDE; 217 virtual void TitleWasSet(NavigationEntry* entry, bool explicit_set) override;
218 218
219 void InnerShowDevTools(const std::string& settings, 219 void InnerShowDevTools(const std::string& settings,
220 const std::string& frontend_url); 220 const std::string& frontend_url);
221 void OnDevToolsWebContentsDestroyed(); 221 void OnDevToolsWebContentsDestroyed();
222 222
223 scoped_ptr<ShellJavaScriptDialogManager> dialog_manager_; 223 scoped_ptr<ShellJavaScriptDialogManager> dialog_manager_;
224 224
225 scoped_ptr<WebContents> web_contents_; 225 scoped_ptr<WebContents> web_contents_;
226 226
227 scoped_ptr<DevToolsWebContentsObserver> devtools_observer_; 227 scoped_ptr<DevToolsWebContentsObserver> devtools_observer_;
(...skipping 30 matching lines...) Expand all
258 static base::Callback<void(Shell*)> shell_created_callback_; 258 static base::Callback<void(Shell*)> shell_created_callback_;
259 259
260 // True if the destructur of Shell should post a quit closure on the current 260 // True if the destructur of Shell should post a quit closure on the current
261 // message loop if the destructed Shell object was the last one. 261 // message loop if the destructed Shell object was the last one.
262 static bool quit_message_loop_; 262 static bool quit_message_loop_;
263 }; 263 };
264 264
265 } // namespace content 265 } // namespace content
266 266
267 #endif // CONTENT_SHELL_BROWSER_SHELL_H_ 267 #endif // CONTENT_SHELL_BROWSER_SHELL_H_
OLDNEW
« no previous file with comments | « content/shell/browser/notify_done_forwarder.h ('k') | content/shell/browser/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698