diff options
author | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-19 19:50:46 +0000 |
---|---|---|
committer | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-19 19:50:46 +0000 |
commit | c11f4fe8409f15abe18b07c9b9a00a4dabb2929b (patch) | |
tree | 20e61d79cd70329737763f32febd7ee8eb6a9fcc /android_webview/browser | |
parent | d0d08ee2e2b4b913e1a53bac71e2a23da1097c93 (diff) | |
download | chromium_src-c11f4fe8409f15abe18b07c9b9a00a4dabb2929b.zip chromium_src-c11f4fe8409f15abe18b07c9b9a00a4dabb2929b.tar.gz chromium_src-c11f4fe8409f15abe18b07c9b9a00a4dabb2929b.tar.bz2 |
[Android WebView] Remove obsolete webviewchromium_strings.pak references.
We are now using the locale paks instead.
Review URL: https://chromiumcodereview.appspot.com/12230058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/browser')
-rw-r--r-- | android_webview/browser/aw_browser_main_parts.cc | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc index 71c35e9..11aaf5c 100644 --- a/android_webview/browser/aw_browser_main_parts.cc +++ b/android_webview/browser/aw_browser_main_parts.cc @@ -49,23 +49,12 @@ void AwBrowserMainParts::PreEarlyInitialization() { int AwBrowserMainParts::PreCreateThreads() { browser_context_->InitializeBeforeThreadCreation(); - // Although we don't load a locale pak for Android WebView, we still - // need to initialise the resource bundle with a locale. ui::ResourceBundle::InitSharedInstanceLocaleOnly( content::GetContentClient()->browser()->GetApplicationLocale(), NULL); - // TODO(benm): It would be nice to be able to take string resources from - // the Android framework for WebView, and rely on resource paks only - // for non-string assets. e.g. graphics (and might be nice in the - // long term to move them into the Android framwork too). Toward - // that, seed the ResourceBundle instance with a non-string, locale - // independant pak. Until we no longer rely on paks for strings, - // load an extra data pack separately that has the strings in it. base::FilePath pak_path; PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path); - ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( - pak_path.AppendASCII("webviewchromium_strings.pak"), - ui::SCALE_FACTOR_NONE); + ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( pak_path.AppendASCII("webviewchromium.pak"), ui::SCALE_FACTOR_NONE); |