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/shell_window.h" | 8 #include "apps/shell_window.h" |
9 #include "apps/shell_window_registry.h" | 9 #include "apps/shell_window_registry.h" |
10 #include "apps/ui/native_app_window.h" | 10 #include "apps/ui/native_app_window.h" |
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
240 maximum_size.set_width(*options->max_width); | 240 maximum_size.set_width(*options->max_width); |
241 if (options->max_height.get()) | 241 if (options->max_height.get()) |
242 maximum_size.set_height(*options->max_height); | 242 maximum_size.set_height(*options->max_height); |
243 | 243 |
244 if (options->hidden.get()) | 244 if (options->hidden.get()) |
245 create_params.hidden = *options->hidden.get(); | 245 create_params.hidden = *options->hidden.get(); |
246 | 246 |
247 if (options->resizable.get()) | 247 if (options->resizable.get()) |
248 create_params.resizable = *options->resizable.get(); | 248 create_params.resizable = *options->resizable.get(); |
249 | 249 |
250 if (GetCurrentChannel() <= chrome::VersionInfo::CHANNEL_DEV && | 250 if (options->always_on_top.get()) |
251 options->always_on_top.get()) { | |
252 create_params.always_on_top = *options->always_on_top.get(); | 251 create_params.always_on_top = *options->always_on_top.get(); |
253 } | |
254 | 252 |
255 if (options->type != extensions::api::app_window::WINDOW_TYPE_PANEL) { | 253 if (options->type != extensions::api::app_window::WINDOW_TYPE_PANEL) { |
256 switch (options->state) { | 254 switch (options->state) { |
257 case extensions::api::app_window::STATE_NONE: | 255 case extensions::api::app_window::STATE_NONE: |
258 case extensions::api::app_window::STATE_NORMAL: | 256 case extensions::api::app_window::STATE_NORMAL: |
259 break; | 257 break; |
260 case extensions::api::app_window::STATE_FULLSCREEN: | 258 case extensions::api::app_window::STATE_FULLSCREEN: |
261 create_params.state = ui::SHOW_STATE_FULLSCREEN; | 259 create_params.state = ui::SHOW_STATE_FULLSCREEN; |
262 break; | 260 break; |
263 case extensions::api::app_window::STATE_MAXIMIZED: | 261 case extensions::api::app_window::STATE_MAXIMIZED: |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
301 HadDevToolsAttached(created_view)) { | 299 HadDevToolsAttached(created_view)) { |
302 new DevToolsRestorer(this, created_view); | 300 new DevToolsRestorer(this, created_view); |
303 return true; | 301 return true; |
304 } | 302 } |
305 | 303 |
306 SendResponse(true); | 304 SendResponse(true); |
307 return true; | 305 return true; |
308 } | 306 } |
309 | 307 |
310 } // namespace extensions | 308 } // namespace extensions |
OLD | NEW |