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

Side by Side 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: 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
« apps/apps.gypi ('K') | « apps/apps.gypi ('k') | no next file » | no next file with comments »
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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 ResourceBundle::GetSharedInstance().AddDataPackFromPath( 98 ResourceBundle::GetSharedInstance().AddDataPackFromPath(
99 resources_pack_path, ui::SCALE_FACTOR_NONE); 99 resources_pack_path, ui::SCALE_FACTOR_NONE);
100 // The dev tool needs shell_devtools_discovery_page.html from
101 // content_shell.pak file.
102 base::FilePath pak_file, pak_dir; 100 base::FilePath pak_file, pak_dir;
tfarina 2014/02/20 18:46:15 Please, clean this up. Like this: base::FilePath
Haojian Wu 2014/02/21 05:50:02 Done.
103 PathService::Get(base::DIR_MODULE, &pak_dir); 101 PathService::Get(base::DIR_MODULE, &pak_dir);
104 pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak")); 102 pak_file = pak_dir.Append(FILE_PATH_LITERAL("app_shell.pak"));
105 ResourceBundle::GetSharedInstance().AddDataPackFromPath( 103 ResourceBundle::GetSharedInstance().AddDataPackFromPath(
106 pak_file, ui::SCALE_FACTOR_NONE); 104 pak_file, ui::SCALE_FACTOR_NONE);
107 } 105 }
108 106
109 } // namespace apps 107 } // namespace apps
OLDNEW
« apps/apps.gypi ('K') | « apps/apps.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698