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

Side by Side Diff: content/shell/shell_main_delegate.cc

Issue 9835062: Mac content shell: Set up resources properly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « content/shell/paths_mac.mm ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/shell/shell_main_delegate.h" 5 #include "content/shell/shell_main_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 } else if (process_type == switches::kPluginProcess) { 102 } else if (process_type == switches::kPluginProcess) {
103 plugin_client_.reset(new content::ShellContentPluginClient); 103 plugin_client_.reset(new content::ShellContentPluginClient);
104 content::GetContentClient()->set_plugin(plugin_client_.get()); 104 content::GetContentClient()->set_plugin(plugin_client_.get());
105 } else if (process_type == switches::kUtilityProcess) { 105 } else if (process_type == switches::kUtilityProcess) {
106 utility_client_.reset(new content::ShellContentUtilityClient); 106 utility_client_.reset(new content::ShellContentUtilityClient);
107 content::GetContentClient()->set_utility(utility_client_.get()); 107 content::GetContentClient()->set_utility(utility_client_.get());
108 } 108 }
109 } 109 }
110 110
111 void ShellMainDelegate::InitializeResourceBundle() { 111 void ShellMainDelegate::InitializeResourceBundle() {
112 FilePath pak_file;
113 #if defined(OS_MACOSX)
114 pak_file = GetResourcesPakFilePath();
115 #else
112 FilePath pak_dir; 116 FilePath pak_dir;
113 PathService::Get(base::DIR_MODULE, &pak_dir); 117 PathService::Get(base::DIR_MODULE, &pak_dir);
114 118 pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));
115 FilePath pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak")); 119 #endif
116 ui::ResourceBundle::InitSharedInstanceWithPakFile(pak_file); 120 ui::ResourceBundle::InitSharedInstanceWithPakFile(pak_file);
117 } 121 }
OLDNEW
« no previous file with comments | « content/shell/paths_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698