| 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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 #endif | 266 #endif |
| 267 #if defined(OS_WIN) | 267 #if defined(OS_WIN) |
| 268 virtual const wchar_t* GetResourceDllName() override; | 268 virtual const wchar_t* GetResourceDllName() override; |
| 269 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, | 269 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, |
| 270 bool* success) override; | 270 bool* success) override; |
| 271 #endif | 271 #endif |
| 272 bool CheckMediaAccessPermission(content::BrowserContext* browser_context, | 272 bool CheckMediaAccessPermission(content::BrowserContext* browser_context, |
| 273 const GURL& security_origin, | 273 const GURL& security_origin, |
| 274 content::MediaStreamType type) override; | 274 content::MediaStreamType type) override; |
| 275 | 275 |
| 276 content::WebContents* OpenURL(content::BrowserContext* browser_context, |
| 277 const content::OpenURLParams& params) override; |
| 278 |
| 276 private: | 279 private: |
| 277 friend class DisableWebRtcEncryptionFlagTest; | 280 friend class DisableWebRtcEncryptionFlagTest; |
| 278 | 281 |
| 279 #if defined(ENABLE_WEBRTC) | 282 #if defined(ENABLE_WEBRTC) |
| 280 // Copies disable WebRTC encryption switch depending on the channel. | 283 // Copies disable WebRTC encryption switch depending on the channel. |
| 281 static void MaybeCopyDisableWebRtcEncryptionSwitch( | 284 static void MaybeCopyDisableWebRtcEncryptionSwitch( |
| 282 base::CommandLine* to_command_line, | 285 base::CommandLine* to_command_line, |
| 283 const base::CommandLine& from_command_line, | 286 const base::CommandLine& from_command_line, |
| 284 VersionInfo::Channel channel); | 287 VersionInfo::Channel channel); |
| 285 #endif | 288 #endif |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 328 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 331 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
| 329 | 332 |
| 330 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 333 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
| 331 | 334 |
| 332 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 335 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
| 333 }; | 336 }; |
| 334 | 337 |
| 335 } // namespace chrome | 338 } // namespace chrome |
| 336 | 339 |
| 337 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 340 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |