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

Unified Diff: ash/shell/content/client/shell_main_delegate.cc

Issue 2316803002: Splits ash_test_resources_100_percent into two pak files (Closed)
Patch Set: feedback Created 4 years, 3 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/resources/BUILD.gn ('k') | ash/test/ash_test_environment.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/content/client/shell_main_delegate.cc
diff --git a/ash/shell/content/client/shell_main_delegate.cc b/ash/shell/content/client/shell_main_delegate.cc
index e984b982aa6d7f48b975e8cecab4c3d9f5131e18..c052bcc6bcd7e140fe8b915fe08ce84ba82bd77f 100644
--- a/ash/shell/content/client/shell_main_delegate.cc
+++ b/ash/shell/content/client/shell_main_delegate.cc
@@ -46,17 +46,19 @@ void ShellMainDelegate::InitializeResourceBundle() {
PathService::Get(base::DIR_MODULE, &path);
base::FilePath ash_test_strings =
path.Append(FILE_PATH_LITERAL("ash_test_strings.pak"));
- base::FilePath ash_test_resources_100 =
- path.Append(FILE_PATH_LITERAL("ash_test_resources_100_percent.pak"));
- base::FilePath ash_test_resources_200 =
- path.Append(FILE_PATH_LITERAL("ash_test_resources_200_percent.pak"));
ui::ResourceBundle::InitSharedInstanceWithPakPath(ash_test_strings);
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
- if (ui::ResourceBundle::IsScaleFactorSupported(ui::SCALE_FACTOR_100P))
+ if (ui::ResourceBundle::IsScaleFactorSupported(ui::SCALE_FACTOR_100P)) {
+ base::FilePath ash_test_resources_100 = path.Append(
+ FILE_PATH_LITERAL("ash_test_resources_with_content_100_percent.pak"));
rb.AddDataPackFromPath(ash_test_resources_100, ui::SCALE_FACTOR_100P);
- if (ui::ResourceBundle::IsScaleFactorSupported(ui::SCALE_FACTOR_200P))
+ }
+ if (ui::ResourceBundle::IsScaleFactorSupported(ui::SCALE_FACTOR_200P)) {
+ base::FilePath ash_test_resources_200 =
+ path.Append(FILE_PATH_LITERAL("ash_test_resources_200_percent.pak"));
rb.AddDataPackFromPath(ash_test_resources_200, ui::SCALE_FACTOR_200P);
+ }
}
} // namespace shell
« no previous file with comments | « ash/resources/BUILD.gn ('k') | ash/test/ash_test_environment.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698