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 #include "android_webview/browser/aw_browser_main_parts.h" | 5 #include "android_webview/browser/aw_browser_main_parts.h" |
6 | 6 |
7 #include "android_webview/browser/aw_browser_context.h" | 7 #include "android_webview/browser/aw_browser_context.h" |
8 #include "android_webview/browser/aw_result_codes.h" | 8 #include "android_webview/browser/aw_result_codes.h" |
9 #include "android_webview/native/aw_assets.h" | 9 #include "android_webview/native/aw_assets.h" |
10 #include "base/android/build_info.h" | 10 #include "base/android/build_info.h" |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 // ResourceBundle/GetApplicationLocale to not require an instance to be | 57 // ResourceBundle/GetApplicationLocale to not require an instance to be |
58 // initialized. | 58 // initialized. |
59 ui::ResourceBundle::InitSharedInstanceLocaleOnly( | 59 ui::ResourceBundle::InitSharedInstanceLocaleOnly( |
60 l10n_util::GetDefaultLocale(), NULL); | 60 l10n_util::GetDefaultLocale(), NULL); |
61 std::string locale = l10n_util::GetApplicationLocale(std::string()) + ".pak"; | 61 std::string locale = l10n_util::GetApplicationLocale(std::string()) + ".pak"; |
62 if (AwAssets::OpenAsset(locale, &pak_fd, &pak_off, &pak_len)) { | 62 if (AwAssets::OpenAsset(locale, &pak_fd, &pak_off, &pak_len)) { |
63 VLOG(0) << "Load from apk succesful, fd=" << pak_fd << " off=" << pak_off | 63 VLOG(0) << "Load from apk succesful, fd=" << pak_fd << " off=" << pak_off |
64 << " len=" << pak_len; | 64 << " len=" << pak_len; |
65 ui::ResourceBundle::CleanupSharedInstance(); | 65 ui::ResourceBundle::CleanupSharedInstance(); |
66 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion( | 66 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion( |
67 base::File(pak_fd), | 67 base::File(pak_fd), base::MemoryMappedFile::Region(pak_off, pak_len)); |
68 base::MemoryMappedFile::Region(pak_off, pak_len), | |
69 /*should_load_common_resources=*/false); | |
70 } else { | 68 } else { |
71 LOG(WARNING) << "Failed to load " << locale << ".pak from the apk too. " | 69 LOG(WARNING) << "Failed to load " << locale << ".pak from the apk too. " |
72 "Bringing up WebView without any locale"; | 70 "Bringing up WebView without any locale"; |
73 } | 71 } |
74 | 72 |
75 // Try to directly mmap the webviewchromium.pak from the apk. Fall back to | 73 // Try to directly mmap the webviewchromium.pak from the apk. Fall back to |
76 // load from file, using PATH_SERVICE, otherwise. | 74 // load from file, using PATH_SERVICE, otherwise. |
77 if (AwAssets::OpenAsset("webviewchromium.pak", &pak_fd, &pak_off, &pak_len)) { | 75 if (AwAssets::OpenAsset("webviewchromium.pak", &pak_fd, &pak_off, &pak_len)) { |
78 VLOG(0) << "Loading webviewchromium.pak from, fd:" << pak_fd | 76 VLOG(0) << "Loading webviewchromium.pak from, fd:" << pak_fd |
79 << " off:" << pak_off << " len:" << pak_len; | 77 << " off:" << pak_off << " len:" << pak_len; |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 content::SetMaxURLChars(20 * 1024 * 1024); | 109 content::SetMaxURLChars(20 * 1024 * 1024); |
112 } | 110 } |
113 | 111 |
114 bool AwBrowserMainParts::MainMessageLoopRun(int* result_code) { | 112 bool AwBrowserMainParts::MainMessageLoopRun(int* result_code) { |
115 // Android WebView does not use default MessageLoop. It has its own | 113 // Android WebView does not use default MessageLoop. It has its own |
116 // Android specific MessageLoop. | 114 // Android specific MessageLoop. |
117 return true; | 115 return true; |
118 } | 116 } |
119 | 117 |
120 } // namespace android_webview | 118 } // namespace android_webview |
OLD | NEW |