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

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

Issue 1181953002: Load non-locale .pak files directly from the .apk on Android (rather than extracting on start-up). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@raw-paks
Patch Set: fix unused LoadMainAndroidPackFile Created 5 years, 6 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 <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 DevToolsManagerDelegate* GetDevToolsManagerDelegate() override; 68 DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;
69 69
70 void OpenURL(BrowserContext* browser_context, 70 void OpenURL(BrowserContext* browser_context,
71 const OpenURLParams& params, 71 const OpenURLParams& params,
72 const base::Callback<void(WebContents*)>& callback) override; 72 const base::Callback<void(WebContents*)>& callback) override;
73 73
74 #if defined(OS_POSIX) && !defined(OS_MACOSX) 74 #if defined(OS_POSIX) && !defined(OS_MACOSX)
75 void GetAdditionalMappedFilesForChildProcess( 75 void GetAdditionalMappedFilesForChildProcess(
76 const base::CommandLine& command_line, 76 const base::CommandLine& command_line,
77 int child_process_id, 77 int child_process_id,
78 FileDescriptorInfo* mappings) override; 78 content::FileDescriptorInfo* mappings
79 #if defined(OS_ANDROID)
80 , std::map<int, base::MemoryMappedFile::Region>* regions
79 #endif 81 #endif
82 ) override;
83 #endif // defined(OS_POSIX) && !defined(OS_MACOSX)
80 #if defined(OS_WIN) 84 #if defined(OS_WIN)
81 void PreSpawnRenderer(sandbox::TargetPolicy* policy, bool* success) override; 85 void PreSpawnRenderer(sandbox::TargetPolicy* policy, bool* success) override;
82 #endif 86 #endif
83 87
84 ShellBrowserContext* browser_context(); 88 ShellBrowserContext* browser_context();
85 ShellBrowserContext* off_the_record_browser_context(); 89 ShellBrowserContext* off_the_record_browser_context();
86 ShellResourceDispatcherHostDelegate* resource_dispatcher_host_delegate() { 90 ShellResourceDispatcherHostDelegate* resource_dispatcher_host_delegate() {
87 return resource_dispatcher_host_delegate_.get(); 91 return resource_dispatcher_host_delegate_.get();
88 } 92 }
89 ShellBrowserMainParts* shell_browser_main_parts() { 93 ShellBrowserMainParts* shell_browser_main_parts() {
(...skipping 14 matching lines...) Expand all
104 resource_dispatcher_host_delegate_; 108 resource_dispatcher_host_delegate_;
105 109
106 base::Closure select_client_certificate_callback_; 110 base::Closure select_client_certificate_callback_;
107 111
108 ShellBrowserMainParts* shell_browser_main_parts_; 112 ShellBrowserMainParts* shell_browser_main_parts_;
109 }; 113 };
110 114
111 } // namespace content 115 } // namespace content
112 116
113 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 117 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698