| 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 <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 298 const base::Callback<void(content::WebContents*)>& callback) | 298 const base::Callback<void(content::WebContents*)>& callback) |
| 299 override; | 299 override; |
| 300 content::PresentationServiceDelegate* GetPresentationServiceDelegate( | 300 content::PresentationServiceDelegate* GetPresentationServiceDelegate( |
| 301 content::WebContents* web_contents) override; | 301 content::WebContents* web_contents) override; |
| 302 | 302 |
| 303 void RecordURLMetric(const std::string& metric, const GURL& url) override; | 303 void RecordURLMetric(const std::string& metric, const GURL& url) override; |
| 304 ScopedVector<content::NavigationThrottle> CreateThrottlesForNavigation( | 304 ScopedVector<content::NavigationThrottle> CreateThrottlesForNavigation( |
| 305 content::NavigationHandle* handle) override; | 305 content::NavigationHandle* handle) override; |
| 306 std::unique_ptr<content::NavigationUIData> GetNavigationUIData( | 306 std::unique_ptr<content::NavigationUIData> GetNavigationUIData( |
| 307 content::NavigationHandle* navigation_handle) override; | 307 content::NavigationHandle* navigation_handle) override; |
| 308 std::unique_ptr<content::MemoryCoordinatorDelegate> |
| 309 GetMemoryCoordinatorDelegate() override; |
| 308 | 310 |
| 309 private: | 311 private: |
| 310 friend class DisableWebRtcEncryptionFlagTest; | 312 friend class DisableWebRtcEncryptionFlagTest; |
| 311 | 313 |
| 312 #if defined(ENABLE_WEBRTC) | 314 #if defined(ENABLE_WEBRTC) |
| 313 // Copies disable WebRTC encryption switch depending on the channel. | 315 // Copies disable WebRTC encryption switch depending on the channel. |
| 314 static void MaybeCopyDisableWebRtcEncryptionSwitch( | 316 static void MaybeCopyDisableWebRtcEncryptionSwitch( |
| 315 base::CommandLine* to_command_line, | 317 base::CommandLine* to_command_line, |
| 316 const base::CommandLine& from_command_line, | 318 const base::CommandLine& from_command_line, |
| 317 version_info::Channel channel); | 319 version_info::Channel channel); |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 351 // Vector of additional ChromeContentBrowserClientParts. | 353 // Vector of additional ChromeContentBrowserClientParts. |
| 352 // Parts are deleted in the reverse order they are added. | 354 // Parts are deleted in the reverse order they are added. |
| 353 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 355 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
| 354 | 356 |
| 355 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 357 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
| 356 | 358 |
| 357 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 359 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
| 358 }; | 360 }; |
| 359 | 361 |
| 360 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 362 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |