OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "ash/shell/content_client/shell_main_delegate.h" | 5 #include "wm/shell/content_client/shell_main_delegate.h" |
6 | 6 |
7 #include "ash/shell/content_client/shell_content_browser_client.h" | 7 #include <string> |
| 8 |
8 #include "base/command_line.h" | 9 #include "base/command_line.h" |
9 #include "base/file_path.h" | |
10 #include "base/path_service.h" | |
11 #include "content/public/common/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
12 #include "ui/base/resource/resource_bundle.h" | 11 #include "ui/base/resource/resource_bundle.h" |
13 #include "ui/base/ui_base_paths.h" | 12 #include "wm/shell/content_client/shell_content_browser_client.h" |
14 | 13 |
15 namespace ash { | 14 namespace wm { |
16 namespace shell { | 15 namespace shell { |
17 | 16 |
18 ShellMainDelegate::ShellMainDelegate() { | 17 ShellMainDelegate::ShellMainDelegate() { |
19 } | 18 } |
20 | 19 |
21 ShellMainDelegate::~ShellMainDelegate() { | 20 ShellMainDelegate::~ShellMainDelegate() { |
22 } | 21 } |
23 | 22 |
24 bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { | 23 bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { |
25 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 24 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
(...skipping 12 matching lines...) Expand all Loading... |
38 content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() { | 37 content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() { |
39 browser_client_.reset(new ShellContentBrowserClient); | 38 browser_client_.reset(new ShellContentBrowserClient); |
40 return browser_client_.get(); | 39 return browser_client_.get(); |
41 } | 40 } |
42 | 41 |
43 void ShellMainDelegate::InitializeResourceBundle() { | 42 void ShellMainDelegate::InitializeResourceBundle() { |
44 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); | 43 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); |
45 } | 44 } |
46 | 45 |
47 } // namespace shell | 46 } // namespace shell |
48 } // namespace ash | 47 } // namespace wm |
OLD | NEW |