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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | apps/shell/browser/DEPS » ('j') | apps/shell/browser/shell_browser_main_parts.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "apps/shell/app/shell_main_delegate.h" 5 #include "apps/shell/app/shell_main_delegate.h"
6 6
7 #include "apps/shell/browser/shell_content_browser_client.h" 7 #include "apps/shell/browser/shell_content_browser_client.h"
8 #include "apps/shell/common/shell_content_client.h" 8 #include "apps/shell/common/shell_content_client.h"
9 #include "apps/shell/renderer/shell_content_renderer_client.h" 9 #include "apps/shell/renderer/shell_content_renderer_client.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 process_type == switches::kUtilityProcess; 88 process_type == switches::kUtilityProcess;
89 } 89 }
90 90
91 void ShellMainDelegate::InitializeResourceBundle() { 91 void ShellMainDelegate::InitializeResourceBundle() {
92 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); 92 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
93 93
94 // The extensions system needs manifest data from the Chrome PAK file. 94 // The extensions system needs manifest data from the Chrome PAK file.
95 // TODO(jamescook): app_shell needs its own manifest data file. 95 // TODO(jamescook): app_shell needs its own manifest data file.
96 base::FilePath resources_pack_path; 96 base::FilePath resources_pack_path;
97 PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path); 97 PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
98 base::FilePath pak_file, pak_dir;
99 PathService::Get(base::DIR_MODULE, &pak_dir);
100 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
98 ResourceBundle::GetSharedInstance().AddDataPackFromPath( 101 ResourceBundle::GetSharedInstance().AddDataPackFromPath(
99 resources_pack_path, ui::SCALE_FACTOR_NONE); 102 resources_pack_path, ui::SCALE_FACTOR_NONE);
103 ResourceBundle::GetSharedInstance().AddDataPackFromPath(
104 pak_file, ui::SCALE_FACTOR_NONE);
100 } 105 }
101 106
102 } // namespace apps 107 } // namespace apps
OLDNEW
« 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