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

Side by Side Diff: ash/shell/content_client/shell_main_delegate.cc

Issue 10270023: Add new ResourceBundle::Delegate interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | « no previous file | ash/shell/shell_main_parts.cc » ('j') | 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 "ash/shell/content_client/shell_main_delegate.h" 5 #include "ash/shell/content_client/shell_main_delegate.h"
6 6
7 #include "ash/shell/content_client/shell_content_browser_client.h" 7 #include "ash/shell/content_client/shell_content_browser_client.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 } else if (process_type == switches::kPluginProcess) { 94 } else if (process_type == switches::kPluginProcess) {
95 plugin_client_.reset(new content::ShellContentPluginClient); 95 plugin_client_.reset(new content::ShellContentPluginClient);
96 content::GetContentClient()->set_plugin(plugin_client_.get()); 96 content::GetContentClient()->set_plugin(plugin_client_.get());
97 } else if (process_type == switches::kUtilityProcess) { 97 } else if (process_type == switches::kUtilityProcess) {
98 utility_client_.reset(new content::ShellContentUtilityClient); 98 utility_client_.reset(new content::ShellContentUtilityClient);
99 content::GetContentClient()->set_utility(utility_client_.get()); 99 content::GetContentClient()->set_utility(utility_client_.get());
100 } 100 }
101 } 101 }
102 102
103 void ShellMainDelegate::InitializeResourceBundle() { 103 void ShellMainDelegate::InitializeResourceBundle() {
104 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US"); 104 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
105 } 105 }
106 106
107 } // namespace shell 107 } // namespace shell
108 } // namespace ash 108 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/shell/shell_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698