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

Side by Side Diff: chrome/browser/chrome_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: Review comments 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 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 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 // Set of origins that can get a handle for FileIO from NaCl. 303 // Set of origins that can get a handle for FileIO from NaCl.
304 std::set<std::string> allowed_file_handle_origins_; 304 std::set<std::string> allowed_file_handle_origins_;
305 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable 305 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable
306 // versions of Chrome. 306 // versions of Chrome.
307 std::set<std::string> allowed_dev_channel_origins_; 307 std::set<std::string> allowed_dev_channel_origins_;
308 #endif 308 #endif
309 309
310 #if defined(OS_POSIX) && !defined(OS_MACOSX) 310 #if defined(OS_POSIX) && !defined(OS_MACOSX)
311 gin::V8Initializer::V8Files v8_files_; 311 gin::V8Initializer::V8Files v8_files_;
312 #endif // OS_POSIX && !OS_MACOSX 312 #endif // OS_POSIX && !OS_MACOSX
313 #if defined(OS_ANDROID)
314 base::ScopedFD icudtl_fd_;
315 base::MemoryMappedFile::Region icudtl_region_;
316 #endif
313 317
314 // Vector of additional ChromeContentBrowserClientParts. 318 // Vector of additional ChromeContentBrowserClientParts.
315 // Parts are deleted in the reverse order they are added. 319 // Parts are deleted in the reverse order they are added.
316 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 320 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
317 321
318 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 322 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
319 323
320 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 324 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
321 }; 325 };
322 326
323 } // namespace chrome 327 } // namespace chrome
324 328
325 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 329 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698