Chromium Code Reviews| Index: chrome/browser/extensions/api/app_window/app_window_api.cc |
| diff --git a/chrome/browser/extensions/api/app_window/app_window_api.cc b/chrome/browser/extensions/api/app_window/app_window_api.cc |
| index e10cee835a3f432c17cb868992d77dad91888631..4e9fd23f3bcdfa451cc08d594ca01d166b0b60d2 100644 |
| --- a/chrome/browser/extensions/api/app_window/app_window_api.cc |
| +++ b/chrome/browser/extensions/api/app_window/app_window_api.cc |
| @@ -33,6 +33,7 @@ const char kInvalidWindowId[] = |
| "The window id can not be more than 256 characters long."; |
| } |
| +const char kPanelTypeOption[] = "panel"; |
| const char kNoneFrameOption[] = "none"; |
| const char kHtmlFrameOption[] = "experimental-html"; |
| @@ -144,16 +145,21 @@ bool AppWindowCreateFunction::RunImpl() { |
| create_params.bounds.set_y(*bounds->top.get()); |
| } |
| + if (options->type.get()) { |
| + if (*options->type == kPanelTypeOption) |
| + create_params.window_type = ShellWindow::WINDOW_TYPE_PANEL; |
|
jeremya
2012/11/29 02:49:05
If these panels are only allowed for Talk, we shou
stevenjb
2012/11/29 03:11:26
In apps v2 panels are not intended to be restricte
|
| + } |
| + |
| if (options->frame.get()) { |
| if (*options->frame == kHtmlFrameOption && |
| CommandLine::ForCurrentProcess()->HasSwitch( |
| switches::kEnableExperimentalExtensionApis)) { |
| - create_params.frame = ShellWindow::CreateParams::FRAME_NONE; |
| + create_params.frame = ShellWindow::FRAME_NONE; |
| inject_html_titlebar = true; |
| } else if (*options->frame == kNoneFrameOption) { |
| - create_params.frame = ShellWindow::CreateParams::FRAME_NONE; |
| + create_params.frame = ShellWindow::FRAME_NONE; |
| } else { |
| - create_params.frame = ShellWindow::CreateParams::FRAME_CHROME; |
| + create_params.frame = ShellWindow::FRAME_CHROME; |
| } |
| } |