| OLD | NEW |
| 1 // Copyright (c) 2013 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 "apps/shell/app_shell_main_delegate.h" | 5 #include "apps/shell/shell_main_delegate.h" |
| 6 | 6 |
| 7 #include "apps/shell/app_shell_content_browser_client.h" | 7 #include "apps/shell/shell_content_browser_client.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
| 12 #include "content/public/browser/browser_main_runner.h" | 12 #include "content/public/browser/browser_main_runner.h" |
| 13 #include "ui/base/resource/resource_bundle.h" | 13 #include "ui/base/resource/resource_bundle.h" |
| 14 | 14 |
| 15 namespace apps { | 15 namespace apps { |
| 16 | 16 |
| 17 AppShellMainDelegate::AppShellMainDelegate() { | 17 ShellMainDelegate::ShellMainDelegate() { |
| 18 } | 18 } |
| 19 | 19 |
| 20 AppShellMainDelegate::~AppShellMainDelegate() { | 20 ShellMainDelegate::~ShellMainDelegate() { |
| 21 } | 21 } |
| 22 | 22 |
| 23 bool AppShellMainDelegate::BasicStartupComplete(int* exit_code) { | 23 bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { |
| 24 // TODO(jamescook): Initialize logging here. | 24 // TODO(jamescook): Initialize logging here. |
| 25 SetContentClient(&content_client_); | 25 SetContentClient(&content_client_); |
| 26 return false; | 26 return false; |
| 27 } | 27 } |
| 28 | 28 |
| 29 void AppShellMainDelegate::PreSandboxStartup() { | 29 void ShellMainDelegate::PreSandboxStartup() { |
| 30 InitializeResourceBundle(); | 30 InitializeResourceBundle(); |
| 31 } | 31 } |
| 32 | 32 |
| 33 content::ContentBrowserClient* | 33 content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() { |
| 34 AppShellMainDelegate::CreateContentBrowserClient() { | 34 browser_client_.reset(new apps::ShellContentBrowserClient); |
| 35 browser_client_.reset(new apps::AppShellContentBrowserClient); | |
| 36 return browser_client_.get(); | 35 return browser_client_.get(); |
| 37 } | 36 } |
| 38 | 37 |
| 39 void AppShellMainDelegate::InitializeResourceBundle() { | 38 void ShellMainDelegate::InitializeResourceBundle() { |
| 40 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); | 39 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); |
| 41 } | 40 } |
| 42 | 41 |
| 43 } // namespace apps | 42 } // namespace apps |
| OLD | NEW |