| 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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 void OpenURL(content::BrowserContext* browser_context, | 284 void OpenURL(content::BrowserContext* browser_context, |
| 285 const content::OpenURLParams& params, | 285 const content::OpenURLParams& params, |
| 286 const base::Callback<void(content::WebContents*)>& callback) | 286 const base::Callback<void(content::WebContents*)>& callback) |
| 287 override; | 287 override; |
| 288 | 288 |
| 289 void RecordURLMetric(const std::string& metric, const GURL& gurl) override; |
| 290 |
| 289 private: | 291 private: |
| 290 friend class DisableWebRtcEncryptionFlagTest; | 292 friend class DisableWebRtcEncryptionFlagTest; |
| 291 | 293 |
| 292 #if defined(ENABLE_WEBRTC) | 294 #if defined(ENABLE_WEBRTC) |
| 293 // Copies disable WebRTC encryption switch depending on the channel. | 295 // Copies disable WebRTC encryption switch depending on the channel. |
| 294 static void MaybeCopyDisableWebRtcEncryptionSwitch( | 296 static void MaybeCopyDisableWebRtcEncryptionSwitch( |
| 295 base::CommandLine* to_command_line, | 297 base::CommandLine* to_command_line, |
| 296 const base::CommandLine& from_command_line, | 298 const base::CommandLine& from_command_line, |
| 297 VersionInfo::Channel channel); | 299 VersionInfo::Channel channel); |
| 298 #endif | 300 #endif |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 348 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
| 347 | 349 |
| 348 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 350 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
| 349 | 351 |
| 350 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 352 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
| 351 }; | 353 }; |
| 352 | 354 |
| 353 } // namespace chrome | 355 } // namespace chrome |
| 354 | 356 |
| 355 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 357 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |