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

Side by Side Diff: apps/shell/app/shell_main_delegate.cc

Issue 176873016: [AppShell] Remove chrome_100_percent.pak dependancy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update Created 6 years, 9 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 const std::string& process_type) { 80 const std::string& process_type) {
81 // The browser process has no process type flag, but needs resources. 81 // The browser process has no process type flag, but needs resources.
82 // On Linux the zygote process opens the resources for the renderers. 82 // On Linux the zygote process opens the resources for the renderers.
83 return process_type.empty() || 83 return process_type.empty() ||
84 process_type == switches::kZygoteProcess || 84 process_type == switches::kZygoteProcess ||
85 process_type == switches::kRendererProcess || 85 process_type == switches::kRendererProcess ||
86 process_type == switches::kUtilityProcess; 86 process_type == switches::kUtilityProcess;
87 } 87 }
88 88
89 void ShellMainDelegate::InitializeResourceBundle() { 89 void ShellMainDelegate::InitializeResourceBundle() {
90 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
91
92 base::FilePath pak_dir; 90 base::FilePath pak_dir;
93 PathService::Get(base::DIR_MODULE, &pak_dir); 91 PathService::Get(base::DIR_MODULE, &pak_dir);
94 ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( 92 ui::ResourceBundle::InitSharedInstanceWithPakPath(
95 pak_dir.AppendASCII("app_shell.pak"), ui::SCALE_FACTOR_NONE); 93 pak_dir.AppendASCII("app_shell.pak"));
96 } 94 }
97 95
98 } // namespace apps 96 } // 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