| 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/native_app_window.h" |
| 9 #include "apps/shell_window.h" | 9 #include "apps/shell_window.h" |
| 10 #include "apps/shell_window_registry.h" | 10 #include "apps/shell_window_registry.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 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/common/switches.h" | 27 #include "extensions/common/switches.h" |
| 28 #include "ui/base/ui_base_types.h" | 28 #include "ui/base/ui_base_types.h" |
| 29 #include "ui/gfx/rect.h" | 29 #include "ui/gfx/rect.h" |
| 30 #include "url/gurl.h" | 30 #include "url/gurl.h" |
| 31 | 31 |
| 32 #if defined(USE_ASH) | 32 #if defined(USE_ASH) |
| 33 #include "ash/shell.h" | 33 #include "ash/shell.h" |
| 34 #include "ash/wm/property_util.h" | |
| 35 #include "ui/aura/root_window.h" | 34 #include "ui/aura/root_window.h" |
| 36 #include "ui/aura/window.h" | 35 #include "ui/aura/window.h" |
| 37 #endif | 36 #endif |
| 38 | 37 |
| 39 using apps::ShellWindow; | 38 using apps::ShellWindow; |
| 40 | 39 |
| 41 namespace app_window = extensions::api::app_window; | 40 namespace app_window = extensions::api::app_window; |
| 42 namespace Create = app_window::Create; | 41 namespace Create = app_window::Create; |
| 43 | 42 |
| 44 namespace extensions { | 43 namespace extensions { |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 HadDevToolsAttached(created_view)) { | 321 HadDevToolsAttached(created_view)) { |
| 323 new DevToolsRestorer(this, created_view); | 322 new DevToolsRestorer(this, created_view); |
| 324 return true; | 323 return true; |
| 325 } | 324 } |
| 326 | 325 |
| 327 SendResponse(true); | 326 SendResponse(true); |
| 328 return true; | 327 return true; |
| 329 } | 328 } |
| 330 | 329 |
| 331 } // namespace extensions | 330 } // namespace extensions |
| OLD | NEW |