diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-14 01:05:49 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-14 01:07:13 +0000 |
| commit | 4ce2aa67840878bb3a92572c0f7f1cf0d1e17a97 (patch) | |
| tree | 9fd91d795e6b755859e0143d912a206fdb0d4e03 /ash/drag_drop | |
| parent | 17a3503b9f011d37a01dd7790806ade6f80da2b3 (diff) | |
| download | chromium_src-4ce2aa67840878bb3a92572c0f7f1cf0d1e17a97.zip chromium_src-4ce2aa67840878bb3a92572c0f7f1cf0d1e17a97.tar.gz chromium_src-4ce2aa67840878bb3a92572c0f7f1cf0d1e17a97.tar.bz2 | |
Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale().
Both methods do almost the same and just difer on whether or not to load
the common resources (aka chrome pak files!).
BUG=340082
TEST=None
R=tony@chromium.org,lambroslambrou@chromium.org
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/457103003
Cr-Commit-Position: refs/heads/master@{#289435}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop')
| -rw-r--r-- | ash/drag_drop/drag_drop_interactive_uitest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/drag_drop/drag_drop_interactive_uitest.cc b/ash/drag_drop/drag_drop_interactive_uitest.cc index 24920fd..4e99df7 100644 --- a/ash/drag_drop/drag_drop_interactive_uitest.cc +++ b/ash/drag_drop/drag_drop_interactive_uitest.cc @@ -130,7 +130,8 @@ class DragDropTest : public test::AshTestBase { gfx::GLSurface::InitializeOneOffForTests(); ui::RegisterPathProvider(); - ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); + ui::ResourceBundle::InitSharedInstanceWithLocale( + "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES); base::FilePath resources_pack_path; PathService::Get(base::DIR_MODULE, &resources_pack_path); resources_pack_path = |