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

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

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

Powered by Google App Engine
This is Rietveld 408576698