[Docking] Persists docked state on Chrome OS

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

 // Copyright 2014 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.h"
 
 #include "apps/ui/views/app_window_frame_view.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 90 matching lines @@
 
 ChromeNativeAppWindowViews::~ChromeNativeAppWindowViews() {}
 
 void ChromeNativeAppWindowViews::OnBeforeWidgetInit(
     const AppWindow::CreateParams& create_params,
     views::Widget::InitParams* init_params,
     views::Widget* widget) {
 }
 
 void ChromeNativeAppWindowViews::OnBeforePanelWidgetInit(
+    bool use_default_origin,
     views::Widget::InitParams* init_params,
     views::Widget* widget) {
 }
 
 void ChromeNativeAppWindowViews::InitializeDefaultWindow(
     const AppWindow::CreateParams& create_params) {
   views::Widget::InitParams init_params(views::Widget::InitParams::TYPE_WINDOW);
   init_params.delegate = this;
   init_params.remove_standard_frame = IsFrameless() || has_frame_color_;
   init_params.use_system_default_icon = true;
@@ skipping 14 matching lines @@
   OnBeforeWidgetInit(create_params, &init_params, widget());
   widget()->Init(init_params);
 
   // The frame insets are required to resolve the bounds specifications
   // correctly. So we set the window bounds and constraints now.
   gfx::Insets frame_insets = GetFrameInsets();
   gfx::Rect window_bounds = create_params.GetInitialWindowBounds(frame_insets);
   SetContentSizeConstraints(create_params.GetContentMinimumSize(frame_insets),
                             create_params.GetContentMaximumSize(frame_insets));
   if (!window_bounds.IsEmpty()) {
-    typedef AppWindow::BoundsSpecification BoundsSpecification;
+    using BoundsSpecification = AppWindow::BoundsSpecification;
     bool position_specified =
         window_bounds.x() != BoundsSpecification::kUnspecifiedPosition &&
         window_bounds.y() != BoundsSpecification::kUnspecifiedPosition;
     if (!position_specified)
       widget()->CenterWindow(window_bounds.size());
     else
       widget()->SetBounds(window_bounds);
   }
 
 #if defined(OS_CHROMEOS)
@@ skipping 47 matching lines @@
   if (preferred_size_.width() == 0)
     preferred_size_.set_width(kDefaultPanelWidth);
   else if (preferred_size_.width() < kMinPanelWidth)
     preferred_size_.set_width(kMinPanelWidth);
 
   if (preferred_size_.height() == 0)
     preferred_size_.set_height(kDefaultPanelHeight);
   else if (preferred_size_.height() < kMinPanelHeight)
     preferred_size_.set_height(kMinPanelHeight);
 
-  params.bounds = gfx::Rect(preferred_size_);
-  OnBeforePanelWidgetInit(&params, widget());
+  params.bounds = gfx::Rect(initial_window_bounds.origin(), preferred_size_);
+  // When a panel is not docked it will be placed at a default origin in the
+  // currently active target root window.
+  bool use_default_position = create_params.state != ui::SHOW_STATE_DOCKED;
+  OnBeforePanelWidgetInit(use_default_position, &params, widget());
+  using BoundsSpecification = AppWindow::BoundsSpecification;
+  bool position_specified =

[benwells, 2015/04/29 21:46:42]

I'm not sure what this check versus BoundsSpecification::kUnspecifiedPosition is
for. This logic is still pretty confusing.

It seems to be:
set bounds to origin from gfx::Insets(), preferred size.
If not docked, override with default bounds (in OnBeforePanelWidgetInit)
if bounds position is not kUnspecified, set bounds to be zero origin and,
preferred size.

Can that be simplified further? If not please explain in comments more as it
isn't clear to slow people like me :)

[varkha, 2015/04/30 02:15:31]

See if you like this flow better. I need to sanitize the position after getting
it from GetInitialWindowBounds similar to how it is done in
InitializeDefaultWindow (not panel).

+      params.bounds.x() != BoundsSpecification::kUnspecifiedPosition &&
+      params.bounds.y() != BoundsSpecification::kUnspecifiedPosition;
+  if (!position_specified)
+    params.bounds = gfx::Rect(preferred_size_);
   widget()->Init(params);
   widget()->set_focus_on_creation(create_params.focused);
 }
 
 views::NonClientFrameView*
 ChromeNativeAppWindowViews::CreateStandardDesktopAppFrame() {
   return views::WidgetDelegateView::CreateNonClientFrameView(widget());
 }
 
 apps::AppWindowFrameView*
@@ skipping 173 matching lines @@
     InitializePanelWindow(create_params);
   } else {
     InitializeDefaultWindow(create_params);
   }
   extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews(
       Profile::FromBrowserContext(app_window->browser_context()),
       widget()->GetFocusManager(),
       extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY,
       NULL));
 }