ui/test/test_suite.cc - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

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: ui/test/test_suite.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge Created 8 years, 5 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:

Index: ui/test/test_suite.cc

diff --git a/ui/test/test_suite.cc b/ui/test/test_suite.cc

index 26e0e93d1d766b14d2b174f1dbb952e621444390..e8a820f52f4f3d55049b1bce7cecd034b29c9a37 100644

--- a/ui/test/test_suite.cc

+++ b/ui/test/test_suite.cc

@@ -55,7 +55,7 @@ void UITestSuite::Initialize() {

#if !defined(OS_MACOSX) && defined(OS_POSIX)

ui::ResourceBundle::GetSharedInstance().AddDataPack(

- pak_dir.AppendASCII("ui_resources.pak"),

+ pak_dir.AppendASCII("ui_resources_standard.pak"),

ui::SCALE_FACTOR_100P);

#endif

}