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

Side by Side Diff: chrome/browser/chrome_content_browser_client.h

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs 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_CHROME_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 ChromeContentBrowserClient(); 46 ChromeContentBrowserClient();
47 virtual ~ChromeContentBrowserClient(); 47 virtual ~ChromeContentBrowserClient();
48 48
49 static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); 49 static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
50 50
51 // Notification that the application locale has changed. This allows us to 51 // Notification that the application locale has changed. This allows us to
52 // update our I/O thread cache of this value. 52 // update our I/O thread cache of this value.
53 static void SetApplicationLocale(const std::string& locale); 53 static void SetApplicationLocale(const std::string& locale);
54 54
55 virtual content::BrowserMainParts* CreateBrowserMainParts( 55 virtual content::BrowserMainParts* CreateBrowserMainParts(
56 const content::MainFunctionParams& parameters) OVERRIDE; 56 const content::MainFunctionParams& parameters) override;
57 virtual std::string GetStoragePartitionIdForSite( 57 virtual std::string GetStoragePartitionIdForSite(
58 content::BrowserContext* browser_context, 58 content::BrowserContext* browser_context,
59 const GURL& site) OVERRIDE; 59 const GURL& site) override;
60 virtual bool IsValidStoragePartitionId( 60 virtual bool IsValidStoragePartitionId(
61 content::BrowserContext* browser_context, 61 content::BrowserContext* browser_context,
62 const std::string& partition_id) OVERRIDE; 62 const std::string& partition_id) override;
63 virtual void GetStoragePartitionConfigForSite( 63 virtual void GetStoragePartitionConfigForSite(
64 content::BrowserContext* browser_context, 64 content::BrowserContext* browser_context,
65 const GURL& site, 65 const GURL& site,
66 bool can_be_default, 66 bool can_be_default,
67 std::string* partition_domain, 67 std::string* partition_domain,
68 std::string* partition_name, 68 std::string* partition_name,
69 bool* in_memory) OVERRIDE; 69 bool* in_memory) override;
70 virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate( 70 virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate(
71 content::WebContents* web_contents) OVERRIDE; 71 content::WebContents* web_contents) override;
72 virtual void RenderProcessWillLaunch( 72 virtual void RenderProcessWillLaunch(
73 content::RenderProcessHost* host) OVERRIDE; 73 content::RenderProcessHost* host) override;
74 virtual bool ShouldUseProcessPerSite(content::BrowserContext* browser_context, 74 virtual bool ShouldUseProcessPerSite(content::BrowserContext* browser_context,
75 const GURL& effective_url) OVERRIDE; 75 const GURL& effective_url) override;
76 virtual GURL GetEffectiveURL(content::BrowserContext* browser_context, 76 virtual GURL GetEffectiveURL(content::BrowserContext* browser_context,
77 const GURL& url) OVERRIDE; 77 const GURL& url) override;
78 virtual void GetAdditionalWebUISchemes( 78 virtual void GetAdditionalWebUISchemes(
79 std::vector<std::string>* additional_schemes) OVERRIDE; 79 std::vector<std::string>* additional_schemes) override;
80 virtual void GetAdditionalWebUIHostsToIgnoreParititionCheck( 80 virtual void GetAdditionalWebUIHostsToIgnoreParititionCheck(
81 std::vector<std::string>* hosts) OVERRIDE; 81 std::vector<std::string>* hosts) override;
82 virtual net::URLRequestContextGetter* CreateRequestContext( 82 virtual net::URLRequestContextGetter* CreateRequestContext(
83 content::BrowserContext* browser_context, 83 content::BrowserContext* browser_context,
84 content::ProtocolHandlerMap* protocol_handlers, 84 content::ProtocolHandlerMap* protocol_handlers,
85 content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE; 85 content::URLRequestInterceptorScopedVector request_interceptors) override;
86 virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition( 86 virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
87 content::BrowserContext* browser_context, 87 content::BrowserContext* browser_context,
88 const base::FilePath& partition_path, 88 const base::FilePath& partition_path,
89 bool in_memory, 89 bool in_memory,
90 content::ProtocolHandlerMap* protocol_handlers, 90 content::ProtocolHandlerMap* protocol_handlers,
91 content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE; 91 content::URLRequestInterceptorScopedVector request_interceptors) override;
92 virtual bool IsHandledURL(const GURL& url) OVERRIDE; 92 virtual bool IsHandledURL(const GURL& url) override;
93 virtual bool CanCommitURL(content::RenderProcessHost* process_host, 93 virtual bool CanCommitURL(content::RenderProcessHost* process_host,
94 const GURL& url) OVERRIDE; 94 const GURL& url) override;
95 virtual bool ShouldAllowOpenURL(content::SiteInstance* site_instance, 95 virtual bool ShouldAllowOpenURL(content::SiteInstance* site_instance,
96 const GURL& url) OVERRIDE; 96 const GURL& url) override;
97 virtual bool IsSuitableHost(content::RenderProcessHost* process_host, 97 virtual bool IsSuitableHost(content::RenderProcessHost* process_host,
98 const GURL& site_url) OVERRIDE; 98 const GURL& site_url) override;
99 virtual bool MayReuseHost(content::RenderProcessHost* process_host) OVERRIDE; 99 virtual bool MayReuseHost(content::RenderProcessHost* process_host) override;
100 virtual bool ShouldTryToUseExistingProcessHost( 100 virtual bool ShouldTryToUseExistingProcessHost(
101 content::BrowserContext* browser_context, const GURL& url) OVERRIDE; 101 content::BrowserContext* browser_context, const GURL& url) override;
102 virtual void SiteInstanceGotProcess( 102 virtual void SiteInstanceGotProcess(
103 content::SiteInstance* site_instance) OVERRIDE; 103 content::SiteInstance* site_instance) override;
104 virtual void SiteInstanceDeleting(content::SiteInstance* site_instance) 104 virtual void SiteInstanceDeleting(content::SiteInstance* site_instance)
105 OVERRIDE; 105 override;
106 virtual bool ShouldSwapBrowsingInstancesForNavigation( 106 virtual bool ShouldSwapBrowsingInstancesForNavigation(
107 content::SiteInstance* site_instance, 107 content::SiteInstance* site_instance,
108 const GURL& current_url, 108 const GURL& current_url,
109 const GURL& new_url) OVERRIDE; 109 const GURL& new_url) override;
110 virtual bool ShouldSwapProcessesForRedirect( 110 virtual bool ShouldSwapProcessesForRedirect(
111 content::ResourceContext* resource_context, 111 content::ResourceContext* resource_context,
112 const GURL& current_url, 112 const GURL& current_url,
113 const GURL& new_url) OVERRIDE; 113 const GURL& new_url) override;
114 virtual bool ShouldAssignSiteForURL(const GURL& url) OVERRIDE; 114 virtual bool ShouldAssignSiteForURL(const GURL& url) override;
115 virtual std::string GetCanonicalEncodingNameByAliasName( 115 virtual std::string GetCanonicalEncodingNameByAliasName(
116 const std::string& alias_name) OVERRIDE; 116 const std::string& alias_name) override;
117 virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line, 117 virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
118 int child_process_id) OVERRIDE; 118 int child_process_id) override;
119 virtual std::string GetApplicationLocale() OVERRIDE; 119 virtual std::string GetApplicationLocale() override;
120 virtual std::string GetAcceptLangs( 120 virtual std::string GetAcceptLangs(
121 content::BrowserContext* context) OVERRIDE; 121 content::BrowserContext* context) override;
122 virtual const gfx::ImageSkia* GetDefaultFavicon() OVERRIDE; 122 virtual const gfx::ImageSkia* GetDefaultFavicon() override;
123 virtual bool AllowAppCache(const GURL& manifest_url, 123 virtual bool AllowAppCache(const GURL& manifest_url,
124 const GURL& first_party, 124 const GURL& first_party,
125 content::ResourceContext* context) OVERRIDE; 125 content::ResourceContext* context) override;
126 virtual bool AllowServiceWorker(const GURL& scope, 126 virtual bool AllowServiceWorker(const GURL& scope,
127 const GURL& first_party, 127 const GURL& first_party,
128 content::ResourceContext* context) OVERRIDE; 128 content::ResourceContext* context) override;
129 virtual bool AllowGetCookie(const GURL& url, 129 virtual bool AllowGetCookie(const GURL& url,
130 const GURL& first_party, 130 const GURL& first_party,
131 const net::CookieList& cookie_list, 131 const net::CookieList& cookie_list,
132 content::ResourceContext* context, 132 content::ResourceContext* context,
133 int render_process_id, 133 int render_process_id,
134 int render_frame_id) OVERRIDE; 134 int render_frame_id) override;
135 virtual bool AllowSetCookie(const GURL& url, 135 virtual bool AllowSetCookie(const GURL& url,
136 const GURL& first_party, 136 const GURL& first_party,
137 const std::string& cookie_line, 137 const std::string& cookie_line,
138 content::ResourceContext* context, 138 content::ResourceContext* context,
139 int render_process_id, 139 int render_process_id,
140 int render_frame_id, 140 int render_frame_id,
141 net::CookieOptions* options) OVERRIDE; 141 net::CookieOptions* options) override;
142 virtual bool AllowSaveLocalState(content::ResourceContext* context) OVERRIDE; 142 virtual bool AllowSaveLocalState(content::ResourceContext* context) override;
143 virtual bool AllowWorkerDatabase( 143 virtual bool AllowWorkerDatabase(
144 const GURL& url, 144 const GURL& url,
145 const base::string16& name, 145 const base::string16& name,
146 const base::string16& display_name, 146 const base::string16& display_name,
147 unsigned long estimated_size, 147 unsigned long estimated_size,
148 content::ResourceContext* context, 148 content::ResourceContext* context,
149 const std::vector<std::pair<int, int> >& render_frames) OVERRIDE; 149 const std::vector<std::pair<int, int> >& render_frames) override;
150 virtual void AllowWorkerFileSystem( 150 virtual void AllowWorkerFileSystem(
151 const GURL& url, 151 const GURL& url,
152 content::ResourceContext* context, 152 content::ResourceContext* context,
153 const std::vector<std::pair<int, int> >& render_frames, 153 const std::vector<std::pair<int, int> >& render_frames,
154 base::Callback<void(bool)> callback) OVERRIDE; 154 base::Callback<void(bool)> callback) override;
155 virtual bool AllowWorkerIndexedDB( 155 virtual bool AllowWorkerIndexedDB(
156 const GURL& url, 156 const GURL& url,
157 const base::string16& name, 157 const base::string16& name,
158 content::ResourceContext* context, 158 content::ResourceContext* context,
159 const std::vector<std::pair<int, int> >& render_frames) OVERRIDE; 159 const std::vector<std::pair<int, int> >& render_frames) override;
160 virtual net::URLRequestContext* OverrideRequestContextForURL( 160 virtual net::URLRequestContext* OverrideRequestContextForURL(
161 const GURL& url, content::ResourceContext* context) OVERRIDE; 161 const GURL& url, content::ResourceContext* context) override;
162 virtual content::QuotaPermissionContext* 162 virtual content::QuotaPermissionContext*
163 CreateQuotaPermissionContext() OVERRIDE; 163 CreateQuotaPermissionContext() override;
164 virtual void AllowCertificateError( 164 virtual void AllowCertificateError(
165 int render_process_id, 165 int render_process_id,
166 int render_frame_id, 166 int render_frame_id,
167 int cert_error, 167 int cert_error,
168 const net::SSLInfo& ssl_info, 168 const net::SSLInfo& ssl_info,
169 const GURL& request_url, 169 const GURL& request_url,
170 content::ResourceType resource_type, 170 content::ResourceType resource_type,
171 bool overridable, 171 bool overridable,
172 bool strict_enforcement, 172 bool strict_enforcement,
173 bool expired_previous_decision, 173 bool expired_previous_decision,
174 const base::Callback<void(bool)>& callback, 174 const base::Callback<void(bool)>& callback,
175 content::CertificateRequestResultType* request) OVERRIDE; 175 content::CertificateRequestResultType* request) override;
176 virtual void SelectClientCertificate( 176 virtual void SelectClientCertificate(
177 int render_process_id, 177 int render_process_id,
178 int render_frame_id, 178 int render_frame_id,
179 net::SSLCertRequestInfo* cert_request_info, 179 net::SSLCertRequestInfo* cert_request_info,
180 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; 180 const base::Callback<void(net::X509Certificate*)>& callback) override;
181 virtual void AddCertificate(net::CertificateMimeType cert_type, 181 virtual void AddCertificate(net::CertificateMimeType cert_type,
182 const void* cert_data, 182 const void* cert_data,
183 size_t cert_size, 183 size_t cert_size,
184 int render_process_id, 184 int render_process_id,
185 int render_frame_id) OVERRIDE; 185 int render_frame_id) override;
186 virtual content::MediaObserver* GetMediaObserver() OVERRIDE; 186 virtual content::MediaObserver* GetMediaObserver() override;
187 virtual void RequestDesktopNotificationPermission( 187 virtual void RequestDesktopNotificationPermission(
188 const GURL& source_origin, 188 const GURL& source_origin,
189 content::RenderFrameHost* render_frame_host, 189 content::RenderFrameHost* render_frame_host,
190 const base::Callback<void(blink::WebNotificationPermission)>& callback) 190 const base::Callback<void(blink::WebNotificationPermission)>& callback)
191 OVERRIDE; 191 override;
192 virtual blink::WebNotificationPermission 192 virtual blink::WebNotificationPermission
193 CheckDesktopNotificationPermission( 193 CheckDesktopNotificationPermission(
194 const GURL& source_origin, 194 const GURL& source_origin,
195 content::ResourceContext* context, 195 content::ResourceContext* context,
196 int render_process_id) OVERRIDE; 196 int render_process_id) override;
197 virtual void ShowDesktopNotification( 197 virtual void ShowDesktopNotification(
198 const content::ShowDesktopNotificationHostMsgParams& params, 198 const content::ShowDesktopNotificationHostMsgParams& params,
199 content::RenderFrameHost* render_frame_host, 199 content::RenderFrameHost* render_frame_host,
200 scoped_ptr<content::DesktopNotificationDelegate> delegate, 200 scoped_ptr<content::DesktopNotificationDelegate> delegate,
201 base::Closure* cancel_callback) OVERRIDE; 201 base::Closure* cancel_callback) override;
202 virtual void RequestGeolocationPermission( 202 virtual void RequestGeolocationPermission(
203 content::WebContents* web_contents, 203 content::WebContents* web_contents,
204 int bridge_id, 204 int bridge_id,
205 const GURL& requesting_frame, 205 const GURL& requesting_frame,
206 bool user_gesture, 206 bool user_gesture,
207 const base::Callback<void(bool)>& result_callback) OVERRIDE; 207 const base::Callback<void(bool)>& result_callback) override;
208 virtual void CancelGeolocationPermissionRequest( 208 virtual void CancelGeolocationPermissionRequest(
209 content::WebContents* web_contents, 209 content::WebContents* web_contents,
210 int bridge_id, 210 int bridge_id,
211 const GURL& requesting_frame) OVERRIDE; 211 const GURL& requesting_frame) override;
212 virtual void RequestMidiSysExPermission( 212 virtual void RequestMidiSysExPermission(
213 content::WebContents* web_contents, 213 content::WebContents* web_contents,
214 int bridge_id, 214 int bridge_id,
215 const GURL& requesting_frame, 215 const GURL& requesting_frame,
216 bool user_gesture, 216 bool user_gesture,
217 base::Callback<void(bool)> result_callback, 217 base::Callback<void(bool)> result_callback,
218 base::Closure* cancel_callback) OVERRIDE; 218 base::Closure* cancel_callback) override;
219 virtual void DidUseGeolocationPermission(content::WebContents* web_contents, 219 virtual void DidUseGeolocationPermission(content::WebContents* web_contents,
220 const GURL& frame_url, 220 const GURL& frame_url,
221 const GURL& main_frame_url) OVERRIDE; 221 const GURL& main_frame_url) override;
222 virtual void RequestProtectedMediaIdentifierPermission( 222 virtual void RequestProtectedMediaIdentifierPermission(
223 content::WebContents* web_contents, 223 content::WebContents* web_contents,
224 const GURL& origin, 224 const GURL& origin,
225 base::Callback<void(bool)> result_callback, 225 base::Callback<void(bool)> result_callback,
226 base::Closure* cancel_callback) OVERRIDE; 226 base::Closure* cancel_callback) override;
227 virtual bool CanCreateWindow(const GURL& opener_url, 227 virtual bool CanCreateWindow(const GURL& opener_url,
228 const GURL& opener_top_level_frame_url, 228 const GURL& opener_top_level_frame_url,
229 const GURL& source_origin, 229 const GURL& source_origin,
230 WindowContainerType container_type, 230 WindowContainerType container_type,
231 const GURL& target_url, 231 const GURL& target_url,
232 const content::Referrer& referrer, 232 const content::Referrer& referrer,
233 WindowOpenDisposition disposition, 233 WindowOpenDisposition disposition,
234 const blink::WebWindowFeatures& features, 234 const blink::WebWindowFeatures& features,
235 bool user_gesture, 235 bool user_gesture,
236 bool opener_suppressed, 236 bool opener_suppressed,
237 content::ResourceContext* context, 237 content::ResourceContext* context,
238 int render_process_id, 238 int render_process_id,
239 int opener_id, 239 int opener_id,
240 bool* no_javascript_access) OVERRIDE; 240 bool* no_javascript_access) override;
241 virtual void ResourceDispatcherHostCreated() OVERRIDE; 241 virtual void ResourceDispatcherHostCreated() override;
242 virtual content::SpeechRecognitionManagerDelegate* 242 virtual content::SpeechRecognitionManagerDelegate*
243 GetSpeechRecognitionManagerDelegate() OVERRIDE; 243 GetSpeechRecognitionManagerDelegate() override;
244 virtual net::NetLog* GetNetLog() OVERRIDE; 244 virtual net::NetLog* GetNetLog() override;
245 virtual content::AccessTokenStore* CreateAccessTokenStore() OVERRIDE; 245 virtual content::AccessTokenStore* CreateAccessTokenStore() override;
246 virtual bool IsFastShutdownPossible() OVERRIDE; 246 virtual bool IsFastShutdownPossible() override;
247 virtual void OverrideWebkitPrefs(content::RenderViewHost* rvh, 247 virtual void OverrideWebkitPrefs(content::RenderViewHost* rvh,
248 const GURL& url, 248 const GURL& url,
249 content::WebPreferences* prefs) OVERRIDE; 249 content::WebPreferences* prefs) override;
250 virtual void BrowserURLHandlerCreated( 250 virtual void BrowserURLHandlerCreated(
251 content::BrowserURLHandler* handler) OVERRIDE; 251 content::BrowserURLHandler* handler) override;
252 virtual void ClearCache(content::RenderViewHost* rvh) OVERRIDE; 252 virtual void ClearCache(content::RenderViewHost* rvh) override;
253 virtual void ClearCookies(content::RenderViewHost* rvh) OVERRIDE; 253 virtual void ClearCookies(content::RenderViewHost* rvh) override;
254 virtual base::FilePath GetDefaultDownloadDirectory() OVERRIDE; 254 virtual base::FilePath GetDefaultDownloadDirectory() override;
255 virtual std::string GetDefaultDownloadName() OVERRIDE; 255 virtual std::string GetDefaultDownloadName() override;
256 virtual void DidCreatePpapiPlugin( 256 virtual void DidCreatePpapiPlugin(
257 content::BrowserPpapiHost* browser_host) OVERRIDE; 257 content::BrowserPpapiHost* browser_host) override;
258 virtual content::BrowserPpapiHost* GetExternalBrowserPpapiHost( 258 virtual content::BrowserPpapiHost* GetExternalBrowserPpapiHost(
259 int plugin_process_id) OVERRIDE; 259 int plugin_process_id) override;
260 virtual bool AllowPepperSocketAPI( 260 virtual bool AllowPepperSocketAPI(
261 content::BrowserContext* browser_context, 261 content::BrowserContext* browser_context,
262 const GURL& url, 262 const GURL& url,
263 bool private_api, 263 bool private_api,
264 const content::SocketPermissionRequest* params) OVERRIDE; 264 const content::SocketPermissionRequest* params) override;
265 virtual ui::SelectFilePolicy* CreateSelectFilePolicy( 265 virtual ui::SelectFilePolicy* CreateSelectFilePolicy(
266 content::WebContents* web_contents) OVERRIDE; 266 content::WebContents* web_contents) override;
267 virtual void GetAdditionalAllowedSchemesForFileSystem( 267 virtual void GetAdditionalAllowedSchemesForFileSystem(
268 std::vector<std::string>* additional_schemes) OVERRIDE; 268 std::vector<std::string>* additional_schemes) override;
269 virtual void GetURLRequestAutoMountHandlers( 269 virtual void GetURLRequestAutoMountHandlers(
270 std::vector<storage::URLRequestAutoMountHandler>* handlers) OVERRIDE; 270 std::vector<storage::URLRequestAutoMountHandler>* handlers) override;
271 virtual void GetAdditionalFileSystemBackends( 271 virtual void GetAdditionalFileSystemBackends(
272 content::BrowserContext* browser_context, 272 content::BrowserContext* browser_context,
273 const base::FilePath& storage_partition_path, 273 const base::FilePath& storage_partition_path,
274 ScopedVector<storage::FileSystemBackend>* additional_backends) OVERRIDE; 274 ScopedVector<storage::FileSystemBackend>* additional_backends) override;
275 virtual content::DevToolsManagerDelegate* 275 virtual content::DevToolsManagerDelegate*
276 GetDevToolsManagerDelegate() OVERRIDE; 276 GetDevToolsManagerDelegate() override;
277 virtual bool IsPluginAllowedToCallRequestOSFileHandle( 277 virtual bool IsPluginAllowedToCallRequestOSFileHandle(
278 content::BrowserContext* browser_context, 278 content::BrowserContext* browser_context,
279 const GURL& url) OVERRIDE; 279 const GURL& url) override;
280 virtual bool IsPluginAllowedToUseDevChannelAPIs( 280 virtual bool IsPluginAllowedToUseDevChannelAPIs(
281 content::BrowserContext* browser_context, 281 content::BrowserContext* browser_context,
282 const GURL& url) OVERRIDE; 282 const GURL& url) override;
283 virtual net::CookieStore* OverrideCookieStoreForRenderProcess( 283 virtual net::CookieStore* OverrideCookieStoreForRenderProcess(
284 int render_process_id) OVERRIDE; 284 int render_process_id) override;
285 285
286 #if defined(OS_POSIX) && !defined(OS_MACOSX) 286 #if defined(OS_POSIX) && !defined(OS_MACOSX)
287 virtual void GetAdditionalMappedFilesForChildProcess( 287 virtual void GetAdditionalMappedFilesForChildProcess(
288 const base::CommandLine& command_line, 288 const base::CommandLine& command_line,
289 int child_process_id, 289 int child_process_id,
290 content::FileDescriptorInfo* mappings) OVERRIDE; 290 content::FileDescriptorInfo* mappings) override;
291 #endif 291 #endif
292 #if defined(OS_WIN) 292 #if defined(OS_WIN)
293 virtual const wchar_t* GetResourceDllName() OVERRIDE; 293 virtual const wchar_t* GetResourceDllName() override;
294 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, 294 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy,
295 bool* success) OVERRIDE; 295 bool* success) override;
296 #endif 296 #endif
297 virtual bool CheckMediaAccessPermission( 297 virtual bool CheckMediaAccessPermission(
298 content::BrowserContext* browser_context, 298 content::BrowserContext* browser_context,
299 const GURL& security_origin, 299 const GURL& security_origin,
300 content::MediaStreamType type) OVERRIDE; 300 content::MediaStreamType type) override;
301 301
302 private: 302 private:
303 friend class DisableWebRtcEncryptionFlagTest; 303 friend class DisableWebRtcEncryptionFlagTest;
304 304
305 #if defined(ENABLE_WEBRTC) 305 #if defined(ENABLE_WEBRTC)
306 // Copies disable WebRTC encryption switch depending on the channel. 306 // Copies disable WebRTC encryption switch depending on the channel.
307 static void MaybeCopyDisableWebRtcEncryptionSwitch( 307 static void MaybeCopyDisableWebRtcEncryptionSwitch(
308 base::CommandLine* to_command_line, 308 base::CommandLine* to_command_line,
309 const base::CommandLine& from_command_line, 309 const base::CommandLine& from_command_line,
310 VersionInfo::Channel channel); 310 VersionInfo::Channel channel);
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 354 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
355 355
356 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 356 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
357 357
358 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 358 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
359 }; 359 };
360 360
361 } // namespace chrome 361 } // namespace chrome
362 362
363 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 363 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_win.cc ('k') | chrome/browser/chrome_content_browser_client_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698