| 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 "extensions/browser/api/app_window/app_window_api.h" | 5 #include "extensions/browser/api/app_window/app_window_api.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 } | 310 } |
| 311 | 311 |
| 312 if (options->focused.get()) | 312 if (options->focused.get()) |
| 313 create_params.focused = *options->focused.get(); | 313 create_params.focused = *options->focused.get(); |
| 314 | 314 |
| 315 if (options->visible_on_all_workspaces.get()) { | 315 if (options->visible_on_all_workspaces.get()) { |
| 316 create_params.visible_on_all_workspaces = | 316 create_params.visible_on_all_workspaces = |
| 317 *options->visible_on_all_workspaces.get(); | 317 *options->visible_on_all_workspaces.get(); |
| 318 } | 318 } |
| 319 | 319 |
| 320 if (options->show_in_shelf.get()) |
| 321 create_params.show_in_shelf = *options->show_in_shelf.get(); |
| 322 |
| 320 if (options->type != app_window::WINDOW_TYPE_PANEL) { | 323 if (options->type != app_window::WINDOW_TYPE_PANEL) { |
| 321 switch (options->state) { | 324 switch (options->state) { |
| 322 case app_window::STATE_NONE: | 325 case app_window::STATE_NONE: |
| 323 case app_window::STATE_NORMAL: | 326 case app_window::STATE_NORMAL: |
| 324 break; | 327 break; |
| 325 case app_window::STATE_FULLSCREEN: | 328 case app_window::STATE_FULLSCREEN: |
| 326 create_params.state = ui::SHOW_STATE_FULLSCREEN; | 329 create_params.state = ui::SHOW_STATE_FULLSCREEN; |
| 327 break; | 330 break; |
| 328 case app_window::STATE_MAXIMIZED: | 331 case app_window::STATE_MAXIMIZED: |
| 329 create_params.state = ui::SHOW_STATE_MAXIMIZED; | 332 create_params.state = ui::SHOW_STATE_MAXIMIZED; |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 549 | 552 |
| 550 if (options.frame->as_frame_options->inactive_color.get()) { | 553 if (options.frame->as_frame_options->inactive_color.get()) { |
| 551 error_ = app_window_constants::kInactiveColorWithoutColor; | 554 error_ = app_window_constants::kInactiveColorWithoutColor; |
| 552 return false; | 555 return false; |
| 553 } | 556 } |
| 554 | 557 |
| 555 return true; | 558 return true; |
| 556 } | 559 } |
| 557 | 560 |
| 558 } // namespace extensions | 561 } // namespace extensions |
| OLD | NEW |