| OLD | NEW |
| 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 "ui/views/examples/content_client/examples_main_delegate.h" | 5 #include "ui/views/examples/content_client/examples_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/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 } else if (process_type == switches::kPluginProcess) { | 116 } else if (process_type == switches::kPluginProcess) { |
| 117 plugin_client_.reset(new content::ShellContentPluginClient); | 117 plugin_client_.reset(new content::ShellContentPluginClient); |
| 118 content::GetContentClient()->set_plugin(plugin_client_.get()); | 118 content::GetContentClient()->set_plugin(plugin_client_.get()); |
| 119 } else if (process_type == switches::kUtilityProcess) { | 119 } else if (process_type == switches::kUtilityProcess) { |
| 120 utility_client_.reset(new content::ShellContentUtilityClient); | 120 utility_client_.reset(new content::ShellContentUtilityClient); |
| 121 content::GetContentClient()->set_utility(utility_client_.get()); | 121 content::GetContentClient()->set_utility(utility_client_.get()); |
| 122 } | 122 } |
| 123 } | 123 } |
| 124 | 124 |
| 125 void ExamplesMainDelegate::InitializeResourceBundle() { | 125 void ExamplesMainDelegate::InitializeResourceBundle() { |
| 126 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US"); | 126 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); |
| 127 } | 127 } |
| 128 | 128 |
| 129 } // namespace examples | 129 } // namespace examples |
| 130 } // namespace views | 130 } // namespace views |
| OLD | NEW |