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

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

Issue 147993009: [App Shell] Add dev tools for debugging (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « no previous file | apps/shell/browser/DEPS » ('j') | apps/shell/browser/shell_browser_main_parts.cc » ('J')
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 964c4c543f866ef5fbb5aa8671634e38f179357f..279ce34ff7acccac6a7d97c2a88fad7571b484ea 100644
--- a/apps/shell/app/shell_main_delegate.cc
+++ b/apps/shell/app/shell_main_delegate.cc
@@ -95,8 +95,13 @@ void ShellMainDelegate::InitializeResourceBundle() {
// TODO(jamescook): app_shell needs its own manifest data file.
base::FilePath resources_pack_path;
PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
+ base::FilePath pak_file, pak_dir;
+ PathService::Get(base::DIR_MODULE, &pak_dir);
+ pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));
James Cook 2014/02/10 20:31:23 Why do we need content_shell's PAK file? Isn't Ch
Haojian Wu 2014/02/11 03:24:36 Done. Yes, we need content_shell.pak here. We use
ResourceBundle::GetSharedInstance().AddDataPackFromPath(
resources_pack_path, ui::SCALE_FACTOR_NONE);
+ ResourceBundle::GetSharedInstance().AddDataPackFromPath(
+ pak_file, ui::SCALE_FACTOR_NONE);
}
} // namespace apps
« no previous file with comments | « no previous file | apps/shell/browser/DEPS » ('j') | apps/shell/browser/shell_browser_main_parts.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698