| 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 "chrome/browser/extensions/api/app_window/app_window_api.h" | 5 #include "chrome/browser/extensions/api/app_window/app_window_api.h" |
| 6 | 6 |
| 7 #include "apps/app_window_contents.h" | 7 #include "apps/app_window_contents.h" |
| 8 #include "apps/apps_client.h" |
| 8 #include "apps/shell_window.h" | 9 #include "apps/shell_window.h" |
| 9 #include "apps/shell_window_registry.h" | 10 #include "apps/shell_window_registry.h" |
| 10 #include "apps/ui/native_app_window.h" | 11 #include "apps/ui/native_app_window.h" |
| 11 #include "base/command_line.h" | 12 #include "base/command_line.h" |
| 12 #include "base/time/time.h" | 13 #include "base/time/time.h" |
| 13 #include "base/values.h" | 14 #include "base/values.h" |
| 14 #include "chrome/browser/app_mode/app_mode_utils.h" | 15 #include "chrome/browser/app_mode/app_mode_utils.h" |
| 15 #include "chrome/browser/devtools/devtools_window.h" | 16 #include "chrome/browser/devtools/devtools_window.h" |
| 16 #include "chrome/browser/extensions/window_controller.h" | 17 #include "chrome/browser/extensions/window_controller.h" |
| 17 #include "chrome/browser/profiles/profile.h" | 18 #include "chrome/browser/profiles/profile.h" |
| 18 #include "chrome/browser/ui/apps/chrome_shell_window_delegate.h" | |
| 19 #include "chrome/common/extensions/api/app_window.h" | 19 #include "chrome/common/extensions/api/app_window.h" |
| 20 #include "chrome/common/extensions/features/feature_channel.h" | 20 #include "chrome/common/extensions/features/feature_channel.h" |
| 21 #include "content/public/browser/notification_registrar.h" | 21 #include "content/public/browser/notification_registrar.h" |
| 22 #include "content/public/browser/notification_types.h" | 22 #include "content/public/browser/notification_types.h" |
| 23 #include "content/public/browser/render_process_host.h" | 23 #include "content/public/browser/render_process_host.h" |
| 24 #include "content/public/browser/render_view_host.h" | 24 #include "content/public/browser/render_view_host.h" |
| 25 #include "content/public/browser/web_contents.h" | 25 #include "content/public/browser/web_contents.h" |
| 26 #include "content/public/common/url_constants.h" | 26 #include "content/public/common/url_constants.h" |
| 27 #include "extensions/browser/extensions_browser_client.h" | 27 #include "extensions/browser/extensions_browser_client.h" |
| 28 #include "extensions/common/switches.h" | 28 #include "extensions/common/switches.h" |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 case extensions::api::app_window::STATE_MINIMIZED: | 258 case extensions::api::app_window::STATE_MINIMIZED: |
| 259 create_params.state = ui::SHOW_STATE_MINIMIZED; | 259 create_params.state = ui::SHOW_STATE_MINIMIZED; |
| 260 break; | 260 break; |
| 261 } | 261 } |
| 262 } | 262 } |
| 263 } | 263 } |
| 264 | 264 |
| 265 create_params.creator_process_id = | 265 create_params.creator_process_id = |
| 266 render_view_host_->GetProcess()->GetID(); | 266 render_view_host_->GetProcess()->GetID(); |
| 267 | 267 |
| 268 ShellWindow* shell_window = new ShellWindow( | 268 ShellWindow* shell_window = |
| 269 GetProfile(), new ChromeShellWindowDelegate(), GetExtension()); | 269 apps::AppsClient::Get()->CreateShellWindow(GetProfile(), GetExtension()); |
| 270 shell_window->Init(url, | 270 shell_window->Init(url, |
| 271 new apps::AppWindowContents(shell_window), | 271 new apps::AppWindowContents(shell_window), |
| 272 create_params); | 272 create_params); |
| 273 | 273 |
| 274 if (chrome::IsRunningInForcedAppMode()) | 274 if (chrome::IsRunningInForcedAppMode()) |
| 275 shell_window->ForcedFullscreen(); | 275 shell_window->ForcedFullscreen(); |
| 276 | 276 |
| 277 content::RenderViewHost* created_view = | 277 content::RenderViewHost* created_view = |
| 278 shell_window->web_contents()->GetRenderViewHost(); | 278 shell_window->web_contents()->GetRenderViewHost(); |
| 279 int view_id = MSG_ROUTING_NONE; | 279 int view_id = MSG_ROUTING_NONE; |
| (...skipping 12 matching lines...) Expand all Loading... |
| 292 ->HadDevToolsAttached(created_view)) { | 292 ->HadDevToolsAttached(created_view)) { |
| 293 new DevToolsRestorer(this, created_view); | 293 new DevToolsRestorer(this, created_view); |
| 294 return true; | 294 return true; |
| 295 } | 295 } |
| 296 | 296 |
| 297 SendResponse(true); | 297 SendResponse(true); |
| 298 return true; | 298 return true; |
| 299 } | 299 } |
| 300 | 300 |
| 301 } // namespace extensions | 301 } // namespace extensions |
| OLD | NEW |