Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Side by Side Diff: content/shell/browser/shell_content_browser_client.h

Issue 2613803003: Simplifying ContentBrowserClient::GetAdditionalMappedFiles...() (Closed)
Patch Set: Addressed jam@'s comment Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
6 #define CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 6 #define CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 net::NetLog* GetNetLog() override; 56 net::NetLog* GetNetLog() override;
57 bool ShouldSwapProcessesForRedirect(BrowserContext* browser_context, 57 bool ShouldSwapProcessesForRedirect(BrowserContext* browser_context,
58 const GURL& current_url, 58 const GURL& current_url,
59 const GURL& new_url) override; 59 const GURL& new_url) override;
60 DevToolsManagerDelegate* GetDevToolsManagerDelegate() override; 60 DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;
61 61
62 void OpenURL(BrowserContext* browser_context, 62 void OpenURL(BrowserContext* browser_context,
63 const OpenURLParams& params, 63 const OpenURLParams& params,
64 const base::Callback<void(WebContents*)>& callback) override; 64 const base::Callback<void(WebContents*)>& callback) override;
65 65
66 #if defined(OS_ANDROID) 66 #if defined(OS_POSIX) && !defined(OS_MACOSX)
67 void GetAdditionalMappedFilesForChildProcess(
68 const base::CommandLine& command_line,
69 int child_process_id,
70 content::FileDescriptorInfo* mappings,
71 std::map<int, base::MemoryMappedFile::Region>* regions) override;
72 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
73 void GetAdditionalMappedFilesForChildProcess( 67 void GetAdditionalMappedFilesForChildProcess(
74 const base::CommandLine& command_line, 68 const base::CommandLine& command_line,
75 int child_process_id, 69 int child_process_id,
76 content::FileDescriptorInfo* mappings) override; 70 content::FileDescriptorInfo* mappings) override;
77 #endif // defined(OS_ANDROID) 71 #endif // defined(OS_POSIX) && !defined(OS_MACOSX)
78 #if defined(OS_WIN) 72 #if defined(OS_WIN)
79 bool PreSpawnRenderer(sandbox::TargetPolicy* policy) override; 73 bool PreSpawnRenderer(sandbox::TargetPolicy* policy) override;
80 #endif 74 #endif
81 75
82 ShellBrowserContext* browser_context(); 76 ShellBrowserContext* browser_context();
83 ShellBrowserContext* off_the_record_browser_context(); 77 ShellBrowserContext* off_the_record_browser_context();
84 ShellResourceDispatcherHostDelegate* resource_dispatcher_host_delegate() { 78 ShellResourceDispatcherHostDelegate* resource_dispatcher_host_delegate() {
85 return resource_dispatcher_host_delegate_.get(); 79 return resource_dispatcher_host_delegate_.get();
86 } 80 }
87 ShellBrowserMainParts* shell_browser_main_parts() { 81 ShellBrowserMainParts* shell_browser_main_parts() {
(...skipping 21 matching lines...) Expand all
109 resource_dispatcher_host_delegate_; 103 resource_dispatcher_host_delegate_;
110 104
111 base::Closure select_client_certificate_callback_; 105 base::Closure select_client_certificate_callback_;
112 106
113 ShellBrowserMainParts* shell_browser_main_parts_; 107 ShellBrowserMainParts* shell_browser_main_parts_;
114 }; 108 };
115 109
116 } // namespace content 110 } // namespace content
117 111
118 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 112 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « content/public/browser/file_descriptor_info.h ('k') | content/shell/browser/shell_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698