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

Unified Diff: apps/shell/app/shell_main_delegate.cc

Issue 173883002: [App Shell] Introduce app_shell.pak (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update Created 6 years, 10 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 | « apps/apps.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell/app/shell_main_delegate.cc
diff --git a/apps/shell/app/shell_main_delegate.cc b/apps/shell/app/shell_main_delegate.cc
index bd8e0cffc2eba4565aa8e6d3b0c91e6cf77f06d9..905ffd5434179b58143721633c8f818dfec10363 100644
--- a/apps/shell/app/shell_main_delegate.cc
+++ b/apps/shell/app/shell_main_delegate.cc
@@ -97,13 +97,11 @@ void ShellMainDelegate::InitializeResourceBundle() {
PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
ResourceBundle::GetSharedInstance().AddDataPackFromPath(
resources_pack_path, ui::SCALE_FACTOR_NONE);
- // The dev tool needs shell_devtools_discovery_page.html from
- // content_shell.pak file.
- base::FilePath pak_file, pak_dir;
+ base::FilePath pak_dir;
PathService::Get(base::DIR_MODULE, &pak_dir);
- pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));
ResourceBundle::GetSharedInstance().AddDataPackFromPath(
- pak_file, ui::SCALE_FACTOR_NONE);
+ pak_dir.Append(FILE_PATH_LITERAL("app_shell.pak")),
+ ui::SCALE_FACTOR_NONE);
}
} // namespace apps
« no previous file with comments | « apps/apps.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698