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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 242 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
243 void GetAdditionalMappedFilesForChildProcess( | 243 void GetAdditionalMappedFilesForChildProcess( |
244 const base::CommandLine& command_line, | 244 const base::CommandLine& command_line, |
245 int child_process_id, | 245 int child_process_id, |
246 content::FileDescriptorInfo* mappings) override; | 246 content::FileDescriptorInfo* mappings) override; |
247 #endif | 247 #endif |
248 #if defined(OS_WIN) | 248 #if defined(OS_WIN) |
249 const wchar_t* GetResourceDllName() override; | 249 const wchar_t* GetResourceDllName() override; |
250 void PreSpawnRenderer(sandbox::TargetPolicy* policy, bool* success) override; | 250 void PreSpawnRenderer(sandbox::TargetPolicy* policy, bool* success) override; |
251 #endif | 251 #endif |
252 | 252 void OverrideRenderFrameMojoServices( |
| 253 content::ServiceRegistry* registry, |
| 254 content::RenderFrameHost* render_frame_host) override; |
253 void OpenURL(content::BrowserContext* browser_context, | 255 void OpenURL(content::BrowserContext* browser_context, |
254 const content::OpenURLParams& params, | 256 const content::OpenURLParams& params, |
255 const base::Callback<void(content::WebContents*)>& callback) | 257 const base::Callback<void(content::WebContents*)>& callback) |
256 override; | 258 override; |
257 | 259 |
258 void RecordURLMetric(const std::string& metric, const GURL& url) override; | 260 void RecordURLMetric(const std::string& metric, const GURL& url) override; |
259 | 261 |
260 private: | 262 private: |
261 friend class DisableWebRtcEncryptionFlagTest; | 263 friend class DisableWebRtcEncryptionFlagTest; |
262 | 264 |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 311 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
310 | 312 |
311 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 313 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
312 | 314 |
313 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 315 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
314 }; | 316 }; |
315 | 317 |
316 } // namespace chrome | 318 } // namespace chrome |
317 | 319 |
318 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 320 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |