[Docking] Persists docked state for tab-less browser windows

ui/views/widget/native_widget_aura.cc

 // Copyright (c) 2012 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 "ui/views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 348 matching lines @@
   // the full window bounds, for example View::ConvertPointToScreen().
   return window_ ? window_->GetBoundsInScreen() : gfx::Rect();
 }
 
 gfx::Rect NativeWidgetAura::GetRestoredBounds() const {
   if (!window_)
     return gfx::Rect();
 
   // Restored bounds should only be relevant if the window is minimized or
   // maximized. However, in some places the code expects GetRestoredBounds()
   // to return the current window bounds if the window is not in either state.

[oshima, 2015/07/10 17:43:56]

can you update the comment?

[varkha, 2015/07/10 19:38:26]

Done.

   if (IsMinimized() || IsMaximized() || IsFullscreen()) {
     // Restore bounds are in screen coordinates, no need to convert.
     gfx::Rect* restore_bounds =
         window_->GetProperty(aura::client::kRestoreBoundsKey);
     if (restore_bounds)
       return *restore_bounds;
   }
-  return window_->GetBoundsInScreen();
+  gfx::Rect bounds = window_->GetBoundsInScreen();
+  if (IsDocked()) {
+    // Restore bounds are in screen coordinates, no need to convert.
+    gfx::Rect* restore_bounds =
+        window_->GetProperty(aura::client::kRestoreBoundsKey);
+    // Use current window horizontal offset origin in order to preserve docked
+    // alignment but preserve restored size and vertical offset for the time
+    // when the |window_| gets undocked.
+    if (restore_bounds) {
+      bounds.set_size(restore_bounds->size());
+      bounds.set_y(restore_bounds->y());
+    }
+  }
+
+  return bounds;
 }
 
 void NativeWidgetAura::SetBounds(const gfx::Rect& bounds) {
   if (!window_)
     return;
 
   aura::Window* root = window_->GetRootWindow();
   if (root) {
     aura::client::ScreenPositionClient* screen_position_client =
         aura::client::GetScreenPositionClient(root);
@@ skipping 72 matching lines @@
 void NativeWidgetAura::ShowMaximizedWithBounds(
     const gfx::Rect& restored_bounds) {
   SetRestoreBounds(window_, restored_bounds);
   ShowWithWindowState(ui::SHOW_STATE_MAXIMIZED);
 }
 
 void NativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) {
   if (!window_)
     return;
 
-  if (state == ui::SHOW_STATE_MAXIMIZED || state == ui::SHOW_STATE_FULLSCREEN)
+  if (state == ui::SHOW_STATE_MAXIMIZED || state == ui::SHOW_STATE_FULLSCREEN ||
+      state == ui::SHOW_STATE_DOCKED) {

[Peter Kasting, 2015/07/10 16:40:56]

Nit: No {}

[varkha, 2015/07/10 19:38:26]

Doesn't multiline condition suggest braces?

     window_->SetProperty(aura::client::kShowStateKey, state);
+  }
   window_->Show();
   if (delegate_->CanActivate()) {
     if (state != ui::SHOW_STATE_INACTIVE)
       Activate();
     // SetInitialFocus() should be always be called, even for
     // SHOW_STATE_INACTIVE. If the window has to stay inactive, the method will
     // do the right thing.
     SetInitialFocus(state);
   }
 }
@@ skipping 469 matching lines @@
   destroying_ = true;
   if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET)
     delete delegate_;
   else
     CloseNow();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, private:
 
+bool NativeWidgetAura::IsDocked() const {
+  return window_ &&
+         window_->GetProperty(aura::client::kShowStateKey) ==
+             ui::SHOW_STATE_DOCKED;
+}
+
 void NativeWidgetAura::SetInitialFocus(ui::WindowShowState show_state) {
   // The window does not get keyboard messages unless we focus it.
   if (!GetWidget()->SetInitialFocus(show_state))
     window_->Focus();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, public:
 
 namespace {
@@ skipping 170 matching lines @@
   l10n_util::AdjustUIFont(&(ncm.lfCaptionFont));
   base::win::ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont)));
   return gfx::FontList(gfx::Font(caption_font));
 #else
   return gfx::FontList();
 #endif
 }
 
 }  // namespace internal
 }  // namespace views