[Docking] Persists docked state on Chrome OS

chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h"
 
 #include "apps/ui/views/app_window_frame_view.h"
 #include "ash/ash_constants.h"
 #include "ash/frame/custom_frame_view_ash.h"
 #include "ash/screen_util.h"
@@ skipping 100 matching lines @@
 };
 
 }  // namespace
 
 ChromeNativeAppWindowViewsAura::ChromeNativeAppWindowViewsAura() {
 }
 
 ChromeNativeAppWindowViewsAura::~ChromeNativeAppWindowViewsAura() {
 }
 
+void ChromeNativeAppWindowViewsAura::InitializeWindow(
+    AppWindow* app_window,
+    const AppWindow::CreateParams& create_params) {
+  ChromeNativeAppWindowViews::InitializeWindow(app_window, create_params);
+#if defined(OS_CHROMEOS)
+  // Restore docked state on Chrome OS and ignore it elsewhere.
+  if (create_params.state == ui::SHOW_STATE_DOCKED) {
+    widget()->GetNativeWindow()->SetProperty(aura::client::kShowStateKey,
+                                             create_params.state);
+  }
+#endif
+}
+
 void ChromeNativeAppWindowViewsAura::OnBeforeWidgetInit(
     const AppWindow::CreateParams& create_params,
     views::Widget::InitParams* init_params,
     views::Widget* widget) {
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   std::string app_name = web_app::GenerateApplicationNameFromExtensionId(
       app_window()->extension_id());
   // Set up a custom WM_CLASS for app windows. This allows task switchers in
   // X11 environments to distinguish them from main browser windows.
   init_params->wm_class_name = web_app::GetWMClassFromAppName(app_name);
@@ skipping 13 matching lines @@
                                  ash::kShellWindowId_ImeWindowParentContainer);
   }
 #endif
 }
 
 void ChromeNativeAppWindowViewsAura::OnBeforePanelWidgetInit(
     views::Widget::InitParams* init_params,
     views::Widget* widget) {
   ChromeNativeAppWindowViews::OnBeforePanelWidgetInit(init_params, widget);
 
-  if (ash::Shell::HasInstance()) {
+  typedef AppWindow::BoundsSpecification BoundsSpecification;

[oshima, 2015/04/23 17:26:06]

using BoundsSpecification = AppWindow::BoundsSpecification;

is better now.

[varkha, 2015/04/24 16:17:33]

Done. Here and elsewhere.

+  bool position_specified =
+      init_params->bounds.x() != BoundsSpecification::kUnspecifiedPosition &&
+      init_params->bounds.y() != BoundsSpecification::kUnspecifiedPosition;
+  if (ash::Shell::HasInstance() && !position_specified) {
     // Open a new panel on the target root.
     init_params->bounds = ash::ScreenUtil::ConvertRectToScreen(
         ash::Shell::GetTargetRootWindow(), gfx::Rect(GetPreferredSize()));
   }
 }
 
 apps::AppWindowFrameView*
 ChromeNativeAppWindowViewsAura::CreateNonStandardAppFrame() {
   apps::AppWindowFrameView* frame =
       ChromeNativeAppWindowViews::CreateNonStandardAppFrame();
@@ skipping 51 matching lines @@
     if (IsFullscreen()) {
       if (immersive_fullscreen_controller_.get() &&
           immersive_fullscreen_controller_->IsEnabled()) {
         // Restore windows which were previously in immersive fullscreen to
         // maximized. Restoring the window to a different fullscreen type
         // makes for a bad experience.
         return ui::SHOW_STATE_MAXIMIZED;
       }
       return ui::SHOW_STATE_FULLSCREEN;
     }
+    if (widget()->GetNativeWindow()->GetProperty(aura::client::kShowStateKey) ==
+        ui::SHOW_STATE_DOCKED) {
+      return ui::SHOW_STATE_DOCKED;
+    }
   }
   // Whitelist states to return so that invalid and transient states
   // are not saved and used to restore windows when they are recreated.
   switch (restore_state) {
     case ui::SHOW_STATE_NORMAL:
     case ui::SHOW_STATE_MAXIMIZED:
     case ui::SHOW_STATE_FULLSCREEN:
       return restore_state;
 
     case ui::SHOW_STATE_DEFAULT:
     case ui::SHOW_STATE_MINIMIZED:
     case ui::SHOW_STATE_INACTIVE:
+    case ui::SHOW_STATE_DOCKED:
     case ui::SHOW_STATE_END:
       return ui::SHOW_STATE_NORMAL;
   }
 
   return ui::SHOW_STATE_NORMAL;
 }
 
 bool ChromeNativeAppWindowViewsAura::IsAlwaysOnTop() const {
   return app_window()->window_type_is_panel()
              ? ash::wm::GetWindowState(widget()->GetNativeWindow())
@@ skipping 98 matching lines @@
   ChromeNativeAppWindowViews::UpdateShape(region.Pass());
 
   aura::Window* native_window = widget()->GetNativeWindow();
   if (shape() && !had_shape) {
     native_window->SetEventTargeter(scoped_ptr<ui::EventTargeter>(
         new ShapedAppWindowTargeter(native_window, this)));
   } else if (!shape() && had_shape) {
     native_window->SetEventTargeter(scoped_ptr<ui::EventTargeter>());
   }
 }