ash/drag_drop/drag_drop_interactive_uitest.cc - Issue 457103003: Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/drag_drop/drag_drop_interactive_uitest.cc

Issue 457103003: Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: REBASE 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

Index: ash/drag_drop/drag_drop_interactive_uitest.cc

diff --git a/ash/drag_drop/drag_drop_interactive_uitest.cc b/ash/drag_drop/drag_drop_interactive_uitest.cc

index 24920fd1b4c3dec7e9e3f0ee37759ea53fecc29a..4e99df7c64ad42195e7ef34e4870615703859d11 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 =

« no previous file with comments | « apps/app_shim/chrome_main_app_mode_mac.mm ('k') | ash/shell/content_client/shell_main_delegate.cc » ('j') | no next file with comments »