| 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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 content::BrowserContext* browser_context, | 237 content::BrowserContext* browser_context, |
| 238 const GURL& url) override; | 238 const GURL& url) override; |
| 239 void OverridePageVisibilityState( | 239 void OverridePageVisibilityState( |
| 240 content::RenderFrameHost* render_frame_host, | 240 content::RenderFrameHost* render_frame_host, |
| 241 blink::WebPageVisibilityState* visibility_state) override; | 241 blink::WebPageVisibilityState* visibility_state) override; |
| 242 | 242 |
| 243 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 243 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 244 void GetAdditionalMappedFilesForChildProcess( | 244 void GetAdditionalMappedFilesForChildProcess( |
| 245 const base::CommandLine& command_line, | 245 const base::CommandLine& command_line, |
| 246 int child_process_id, | 246 int child_process_id, |
| 247 content::FileDescriptorInfo* mappings) override; | 247 content::FileDescriptorInfo* mappings |
| 248 #if defined(OS_ANDROID) |
| 249 , std::map<int, base::MemoryMappedFile::Region>* regions |
| 248 #endif | 250 #endif |
| 251 ) override; |
| 252 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) |
| 249 #if defined(OS_WIN) | 253 #if defined(OS_WIN) |
| 250 const wchar_t* GetResourceDllName() override; | 254 const wchar_t* GetResourceDllName() override; |
| 251 void PreSpawnRenderer(sandbox::TargetPolicy* policy, bool* success) override; | 255 void PreSpawnRenderer(sandbox::TargetPolicy* policy, bool* success) override; |
| 252 #endif | 256 #endif |
| 253 void OverrideRenderFrameMojoServices( | 257 void OverrideRenderFrameMojoServices( |
| 254 content::ServiceRegistry* registry, | 258 content::ServiceRegistry* registry, |
| 255 content::RenderFrameHost* render_frame_host) override; | 259 content::RenderFrameHost* render_frame_host) override; |
| 256 void RegisterMojoApplications(StaticMojoApplicationMap* apps) override; | 260 void RegisterMojoApplications(StaticMojoApplicationMap* apps) override; |
| 257 void OpenURL(content::BrowserContext* browser_context, | 261 void OpenURL(content::BrowserContext* browser_context, |
| 258 const content::OpenURLParams& params, | 262 const content::OpenURLParams& params, |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 314 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
| 311 | 315 |
| 312 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 316 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
| 313 | 317 |
| 314 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 318 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
| 315 }; | 319 }; |
| 316 | 320 |
| 317 } // namespace chrome | 321 } // namespace chrome |
| 318 | 322 |
| 319 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 323 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |