| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "extensions/shell/browser/shell_apps_client.h" | 5 #include "extensions/shell/browser/shell_apps_client.h" |
| 6 | 6 |
| 7 #include "extensions/browser/app_window/app_window.h" | 7 #include "extensions/browser/app_window/app_window.h" |
| 8 #include "extensions/shell/browser/desktop_controller.h" | 8 #include "extensions/shell/browser/desktop_controller.h" |
| 9 #include "extensions/shell/browser/shell_app_delegate.h" | |
| 10 #include "extensions/shell/browser/shell_native_app_window.h" | 9 #include "extensions/shell/browser/shell_native_app_window.h" |
| 11 | 10 |
| 12 namespace extensions { | 11 namespace extensions { |
| 13 | 12 |
| 14 ShellAppsClient::ShellAppsClient() { | 13 ShellAppsClient::ShellAppsClient() { |
| 15 } | 14 } |
| 16 | 15 |
| 17 ShellAppsClient::~ShellAppsClient() { | 16 ShellAppsClient::~ShellAppsClient() { |
| 18 } | 17 } |
| 19 | 18 |
| 20 std::vector<content::BrowserContext*> | 19 std::vector<content::BrowserContext*> |
| 21 ShellAppsClient::GetLoadedBrowserContexts() { | 20 ShellAppsClient::GetLoadedBrowserContexts() { |
| 22 NOTIMPLEMENTED(); | 21 NOTIMPLEMENTED(); |
| 23 return std::vector<content::BrowserContext*>(); | 22 return std::vector<content::BrowserContext*>(); |
| 24 } | 23 } |
| 25 | 24 |
| 26 AppWindow* ShellAppsClient::CreateAppWindow(content::BrowserContext* context, | 25 AppWindow* ShellAppsClient::CreateAppWindow(content::BrowserContext* context, |
| 27 const Extension* extension) { | 26 const Extension* extension) { |
| 28 return new AppWindow(context, new ShellAppDelegate, extension); | 27 return DesktopController::instance()->CreateAppWindow(context, extension); |
| 29 } | 28 } |
| 30 | 29 |
| 31 NativeAppWindow* ShellAppsClient::CreateNativeAppWindow( | 30 NativeAppWindow* ShellAppsClient::CreateNativeAppWindow( |
| 32 AppWindow* window, | 31 AppWindow* window, |
| 33 const AppWindow::CreateParams& params) { | 32 const AppWindow::CreateParams& params) { |
| 34 ShellNativeAppWindow* native_app_window = | 33 ShellNativeAppWindow* native_app_window = |
| 35 new ShellNativeAppWindow(window, params); | 34 new ShellNativeAppWindow(window, params); |
| 36 DesktopController::instance()->AddAppWindow( | 35 DesktopController::instance()->AddAppWindow( |
| 37 native_app_window->GetNativeWindow()); | 36 native_app_window->GetNativeWindow()); |
| 38 return native_app_window; | 37 return native_app_window; |
| (...skipping 10 matching lines...) Expand all Loading... |
| 49 void ShellAppsClient::OpenDevToolsWindow(content::WebContents* web_contents, | 48 void ShellAppsClient::OpenDevToolsWindow(content::WebContents* web_contents, |
| 50 const base::Closure& callback) { | 49 const base::Closure& callback) { |
| 51 NOTIMPLEMENTED(); | 50 NOTIMPLEMENTED(); |
| 52 } | 51 } |
| 53 | 52 |
| 54 bool ShellAppsClient::IsCurrentChannelOlderThanDev() { | 53 bool ShellAppsClient::IsCurrentChannelOlderThanDev() { |
| 55 return false; | 54 return false; |
| 56 } | 55 } |
| 57 | 56 |
| 58 } // namespace extensions | 57 } // namespace extensions |
| OLD | NEW |