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

Side by Side Diff: ash/shell/content_client/shell_content_browser_client.h

Issue 1147213004: Store and load icudtl.dat directly from the apk rather than extracting on start-up (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@load-from-apk
Patch Set: Keep extracting for components/ 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 (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 ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
6 #define ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ 6 #define ASH_SHELL_CONTENT_CLIENT_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 21 matching lines...) Expand all
32 net::URLRequestContextGetter* CreateRequestContext( 32 net::URLRequestContextGetter* CreateRequestContext(
33 content::BrowserContext* browser_context, 33 content::BrowserContext* browser_context,
34 content::ProtocolHandlerMap* protocol_handlers, 34 content::ProtocolHandlerMap* protocol_handlers,
35 content::URLRequestInterceptorScopedVector request_interceptors) override; 35 content::URLRequestInterceptorScopedVector request_interceptors) override;
36 void AppendExtraCommandLineSwitches(base::CommandLine* command_line, 36 void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
37 int child_process_id) override; 37 int child_process_id) override;
38 #if defined(OS_POSIX) && !defined(OS_MACOSX) 38 #if defined(OS_POSIX) && !defined(OS_MACOSX)
39 void GetAdditionalMappedFilesForChildProcess( 39 void GetAdditionalMappedFilesForChildProcess(
40 const base::CommandLine& command_line, 40 const base::CommandLine& command_line,
41 int child_process_id, 41 int child_process_id,
42 content::FileDescriptorInfo* mappings) override; 42 content::FileDescriptorInfo* mappings
43 #if defined(OS_ANDROID)
44 , std::map<int, base::MemoryMappedFile::Region>* regions
43 #endif 45 #endif
46 ) override;
47 #endif // defined(OS_POSIX) && !defined(OS_MACOSX)
44 48
45 content::ShellBrowserContext* browser_context(); 49 content::ShellBrowserContext* browser_context();
46 50
47 private: 51 private:
48 #if defined(OS_POSIX) && !defined(OS_MACOSX) 52 #if defined(OS_POSIX) && !defined(OS_MACOSX)
49 base::ScopedFD v8_natives_fd_; 53 base::ScopedFD v8_natives_fd_;
50 base::ScopedFD v8_snapshot_fd_; 54 base::ScopedFD v8_snapshot_fd_;
51 #endif 55 #endif
52 56
53 ShellBrowserMainParts* shell_browser_main_parts_; 57 ShellBrowserMainParts* shell_browser_main_parts_;
54 58
55 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient); 59 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient);
56 }; 60 };
57 61
58 } // namespace shell 62 } // namespace shell
59 } // namespace ash 63 } // namespace ash
60 64
61 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ 65 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698