Index: chrome/browser/extensions/api/tabs/tabs_api.cc |
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc |
index 3bcf3db1f36819a2804ad06844a2ba1d22171df6..d9f7196cd6e8ddac5a00fd59a14f77798265c3c8 100644 |
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc |
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc |
@@ -184,6 +184,7 @@ void AssignOptionalValue(const scoped_ptr<T>& source, |
ui::WindowShowState ConvertToWindowShowState(windows::WindowState state) { |
switch (state) { |
case windows::WINDOW_STATE_NORMAL: |
+ case windows::WINDOW_STATE_DOCKED: |
return ui::SHOW_STATE_NORMAL; |
case windows::WINDOW_STATE_MINIMIZED: |
return ui::SHOW_STATE_MINIMIZED; |
@@ -528,6 +529,7 @@ bool WindowsCreateFunction::RunSync() { |
if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) { |
AppWindow::CreateParams create_params; |
create_params.window_type = AppWindow::WINDOW_TYPE_V1_PANEL; |
+ create_params.window_key = extension_id; |
create_params.window_spec.bounds = window_bounds; |
create_params.focused = saw_focus_key && focused; |
AppWindow* app_window = new AppWindow( |