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/native_app_window.h" |
8 #include "apps/shell_window.h" | 9 #include "apps/shell_window.h" |
9 #include "base/command_line.h" | 10 #include "base/command_line.h" |
10 #include "base/time/time.h" | 11 #include "base/time/time.h" |
11 #include "base/values.h" | 12 #include "base/values.h" |
12 #include "chrome/browser/app_mode/app_mode_utils.h" | 13 #include "chrome/browser/app_mode/app_mode_utils.h" |
13 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
14 #include "chrome/browser/devtools/devtools_window.h" | 15 #include "chrome/browser/devtools/devtools_window.h" |
15 #include "chrome/browser/extensions/shell_window_registry.h" | 16 #include "chrome/browser/extensions/shell_window_registry.h" |
16 #include "chrome/browser/extensions/window_controller.h" | 17 #include "chrome/browser/extensions/window_controller.h" |
17 #include "chrome/browser/ui/apps/chrome_shell_window_delegate.h" | 18 #include "chrome/browser/ui/apps/chrome_shell_window_delegate.h" |
18 #include "chrome/browser/ui/extensions/native_app_window.h" | |
19 #include "chrome/common/extensions/api/app_window.h" | 19 #include "chrome/common/extensions/api/app_window.h" |
20 #include "content/public/browser/notification_registrar.h" | 20 #include "content/public/browser/notification_registrar.h" |
21 #include "content/public/browser/notification_types.h" | 21 #include "content/public/browser/notification_types.h" |
22 #include "content/public/browser/render_process_host.h" | 22 #include "content/public/browser/render_process_host.h" |
23 #include "content/public/browser/render_view_host.h" | 23 #include "content/public/browser/render_view_host.h" |
24 #include "content/public/browser/web_contents.h" | 24 #include "content/public/browser/web_contents.h" |
25 #include "content/public/common/url_constants.h" | 25 #include "content/public/common/url_constants.h" |
26 #include "extensions/common/switches.h" | 26 #include "extensions/common/switches.h" |
27 #include "ui/base/ui_base_types.h" | 27 #include "ui/base/ui_base_types.h" |
28 #include "ui/gfx/rect.h" | 28 #include "ui/gfx/rect.h" |
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 gfx::Size size = ash::Shell::GetPrimaryRootWindow()->bounds().size(); | 286 gfx::Size size = ash::Shell::GetPrimaryRootWindow()->bounds().size(); |
287 if (size.width() > create_params.maximum_size.width() || | 287 if (size.width() > create_params.maximum_size.width() || |
288 size.height() > create_params.maximum_size.height()) | 288 size.height() > create_params.maximum_size.height()) |
289 force_maximize = false; | 289 force_maximize = false; |
290 } | 290 } |
291 #endif | 291 #endif |
292 | 292 |
293 if (force_maximize) | 293 if (force_maximize) |
294 create_params.state = ui::SHOW_STATE_MAXIMIZED; | 294 create_params.state = ui::SHOW_STATE_MAXIMIZED; |
295 | 295 |
296 ShellWindow* shell_window = new ShellWindow( | 296 ShellWindow* shell_window = new ShellWindow(profile(), |
297 profile(), | 297 new ChromeShellWindowDelegate(), |
298 new chrome::ChromeShellWindowDelegate(), | 298 GetExtension()); |
299 GetExtension()); | |
300 shell_window->Init(url, | 299 shell_window->Init(url, |
301 new apps::AppWindowContents(shell_window), | 300 new apps::AppWindowContents(shell_window), |
302 create_params); | 301 create_params); |
303 | 302 |
304 if (chrome::IsRunningInForcedAppMode()) | 303 if (chrome::IsRunningInForcedAppMode()) |
305 shell_window->Fullscreen(); | 304 shell_window->Fullscreen(); |
306 | 305 |
307 content::RenderViewHost* created_view = | 306 content::RenderViewHost* created_view = |
308 shell_window->web_contents()->GetRenderViewHost(); | 307 shell_window->web_contents()->GetRenderViewHost(); |
309 int view_id = MSG_ROUTING_NONE; | 308 int view_id = MSG_ROUTING_NONE; |
(...skipping 11 matching lines...) Expand all Loading... |
321 if (ShellWindowRegistry::Get(profile())->HadDevToolsAttached(created_view)) { | 320 if (ShellWindowRegistry::Get(profile())->HadDevToolsAttached(created_view)) { |
322 new DevToolsRestorer(this, created_view); | 321 new DevToolsRestorer(this, created_view); |
323 return true; | 322 return true; |
324 } | 323 } |
325 | 324 |
326 SendResponse(true); | 325 SendResponse(true); |
327 return true; | 326 return true; |
328 } | 327 } |
329 | 328 |
330 } // namespace extensions | 329 } // namespace extensions |
OLD | NEW |