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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/ash_native_cursor_manager_interactive_uitest.cc

Issue 457103003: Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/test/test_suite.cc ('k') | chrome/app/chrome_main_delegate.cc » ('j') | ui/base/resource/resource_bundle.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/ash_native_cursor_manager_interactive_uitest.cc
diff --git a/ash/wm/ash_native_cursor_manager_interactive_uitest.cc b/ash/wm/ash_native_cursor_manager_interactive_uitest.cc
index 83df158964464be84e5c6cc8d9a7d1019508f9f9..b0d967f5371974929e7dfdd198e710df2953366c 100644
--- a/ash/wm/ash_native_cursor_manager_interactive_uitest.cc
+++ b/ash/wm/ash_native_cursor_manager_interactive_uitest.cc
@@ -34,7 +34,7 @@ class AshNativeCursorManagerTest : public test::AshTestBase {
gfx::GLSurface::InitializeOneOffForTests();
ui::RegisterPathProvider();
- ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
+ ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL, true);
base::FilePath resources_pack_path;
PathService::Get(base::DIR_MODULE, &resources_pack_path);
resources_pack_path =
« no previous file with comments | « ash/test/test_suite.cc ('k') | chrome/app/chrome_main_delegate.cc » ('j') | ui/base/resource/resource_bundle.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698