| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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_content_browser_client.h" | 5 #include "apps/shell/shell_content_browser_client.h" |
| 6 | 6 |
| 7 #include "apps/shell/app_shell_browser_context.h" | 7 #include "apps/shell/shell_browser_context.h" |
| 8 #include "apps/shell/app_shell_browser_main_parts.h" | 8 #include "apps/shell/shell_browser_main_parts.h" |
| 9 #include "content/shell/browser/shell_browser_context.h" | 9 #include "content/shell/browser/shell_browser_context.h" |
| 10 | 10 |
| 11 namespace apps { | 11 namespace apps { |
| 12 | 12 |
| 13 AppShellContentBrowserClient::AppShellContentBrowserClient() | 13 ShellContentBrowserClient::ShellContentBrowserClient() |
| 14 : browser_main_parts_(NULL) { | 14 : browser_main_parts_(NULL) { |
| 15 } | 15 } |
| 16 | 16 |
| 17 AppShellContentBrowserClient::~AppShellContentBrowserClient() { | 17 ShellContentBrowserClient::~ShellContentBrowserClient() { |
| 18 } | 18 } |
| 19 | 19 |
| 20 content::BrowserMainParts* AppShellContentBrowserClient::CreateBrowserMainParts( | 20 content::BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts( |
| 21 const content::MainFunctionParams& parameters) { | 21 const content::MainFunctionParams& parameters) { |
| 22 browser_main_parts_ = new AppShellBrowserMainParts(parameters); | 22 browser_main_parts_ = new ShellBrowserMainParts(parameters); |
| 23 return browser_main_parts_; | 23 return browser_main_parts_; |
| 24 } | 24 } |
| 25 | 25 |
| 26 net::URLRequestContextGetter* | 26 net::URLRequestContextGetter* |
| 27 AppShellContentBrowserClient::CreateRequestContext( | 27 ShellContentBrowserClient::CreateRequestContext( |
| 28 content::BrowserContext* content_browser_context, | 28 content::BrowserContext* content_browser_context, |
| 29 content::ProtocolHandlerMap* protocol_handlers) { | 29 content::ProtocolHandlerMap* protocol_handlers) { |
| 30 // TODO(jamescook): Should this be an off-the-record context? | 30 // TODO(jamescook): Should this be an off-the-record context? |
| 31 return browser_main_parts_->browser_context()->CreateRequestContext( | 31 return browser_main_parts_->browser_context()->CreateRequestContext( |
| 32 protocol_handlers); | 32 protocol_handlers); |
| 33 } | 33 } |
| 34 | 34 |
| 35 } // namespace apps | 35 } // namespace apps |
| OLD | NEW |