OLD | NEW |
---|---|
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 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
274 #endif | 274 #endif |
275 #if defined(OS_WIN) | 275 #if defined(OS_WIN) |
276 virtual const wchar_t* GetResourceDllName() override; | 276 virtual const wchar_t* GetResourceDllName() override; |
277 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, | 277 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, |
278 bool* success) override; | 278 bool* success) override; |
279 #endif | 279 #endif |
280 bool CheckMediaAccessPermission(content::BrowserContext* browser_context, | 280 bool CheckMediaAccessPermission(content::BrowserContext* browser_context, |
281 const GURL& security_origin, | 281 const GURL& security_origin, |
282 content::MediaStreamType type) override; | 282 content::MediaStreamType type) override; |
283 | 283 |
284 content::WebContents* OpenURL(content::BrowserContext* browser_context, | 284 void OpenURL(content::BrowserContext* browser_context, |
285 const content::OpenURLParams& params) override; | 285 const content::OpenURLParams& params, |
286 const base::Callback<void(content::WebContents*)>& callback) | |
287 override; | |
mlamouri (slow - plz ping)
2015/02/11 13:50:23
nit: override in its line alone, is that fine per
Peter Beverloo
2015/02/11 16:18:27
I don't see why not, it's a continuation with 4-sp
| |
286 | 288 |
287 private: | 289 private: |
288 friend class DisableWebRtcEncryptionFlagTest; | 290 friend class DisableWebRtcEncryptionFlagTest; |
289 | 291 |
290 #if defined(ENABLE_WEBRTC) | 292 #if defined(ENABLE_WEBRTC) |
291 // Copies disable WebRTC encryption switch depending on the channel. | 293 // Copies disable WebRTC encryption switch depending on the channel. |
292 static void MaybeCopyDisableWebRtcEncryptionSwitch( | 294 static void MaybeCopyDisableWebRtcEncryptionSwitch( |
293 base::CommandLine* to_command_line, | 295 base::CommandLine* to_command_line, |
294 const base::CommandLine& from_command_line, | 296 const base::CommandLine& from_command_line, |
295 VersionInfo::Channel channel); | 297 VersionInfo::Channel channel); |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
339 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 341 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
340 | 342 |
341 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 343 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
342 | 344 |
343 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 345 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
344 }; | 346 }; |
345 | 347 |
346 } // namespace chrome | 348 } // namespace chrome |
347 | 349 |
348 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 350 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |