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 "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 "content/public/common/content_switches.h" | 9 #include "content/public/common/content_switches.h" |
10 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
11 | 11 |
12 namespace ash { | 12 namespace ash { |
13 namespace shell { | 13 namespace shell { |
14 | 14 |
15 ShellMainDelegate::ShellMainDelegate() { | 15 ShellMainDelegate::ShellMainDelegate() { |
16 } | 16 } |
17 | 17 |
18 ShellMainDelegate::~ShellMainDelegate() { | 18 ShellMainDelegate::~ShellMainDelegate() { |
19 } | 19 } |
20 | 20 |
21 bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { | 21 bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { |
22 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 22 const base::CommandLine& command_line = |
| 23 *base::CommandLine::ForCurrentProcess(); |
23 std::string process_type = | 24 std::string process_type = |
24 command_line.GetSwitchValueASCII(switches::kProcessType); | 25 command_line.GetSwitchValueASCII(switches::kProcessType); |
25 | 26 |
26 content::SetContentClient(&content_client_); | 27 content::SetContentClient(&content_client_); |
27 | 28 |
28 return false; | 29 return false; |
29 } | 30 } |
30 | 31 |
31 void ShellMainDelegate::PreSandboxStartup() { | 32 void ShellMainDelegate::PreSandboxStartup() { |
32 InitializeResourceBundle(); | 33 InitializeResourceBundle(); |
33 } | 34 } |
34 | 35 |
35 content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() { | 36 content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() { |
36 browser_client_.reset(new ShellContentBrowserClient); | 37 browser_client_.reset(new ShellContentBrowserClient); |
37 return browser_client_.get(); | 38 return browser_client_.get(); |
38 } | 39 } |
39 | 40 |
40 void ShellMainDelegate::InitializeResourceBundle() { | 41 void ShellMainDelegate::InitializeResourceBundle() { |
41 ui::ResourceBundle::InitSharedInstanceWithLocale( | 42 ui::ResourceBundle::InitSharedInstanceWithLocale( |
42 "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES); | 43 "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES); |
43 } | 44 } |
44 | 45 |
45 } // namespace shell | 46 } // namespace shell |
46 } // namespace ash | 47 } // namespace ash |
OLD | NEW |