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

chrome/browser/ui/window_sizer/window_sizer.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 "chrome/browser/ui/window_sizer/window_sizer.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 59 matching lines @@
     int work_area_right = 0;
     if (wp_pref) {
       wp_pref->GetInteger("work_area_top", &work_area_top);
       wp_pref->GetInteger("work_area_left", &work_area_left);
       wp_pref->GetInteger("work_area_bottom", &work_area_bottom);
       wp_pref->GetInteger("work_area_right", &work_area_right);
       if (*show_state == ui::SHOW_STATE_DEFAULT && maximized)
         *show_state = ui::SHOW_STATE_MAXIMIZED;
       bool docked = false;
       wp_pref->GetBoolean("docked", &docked);
-      if (*show_state == ui::SHOW_STATE_NORMAL && docked &&
+      if (*show_state == ui::SHOW_STATE_DEFAULT && docked &&
           !browser_->is_type_tabbed() &&
           browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) {
         *show_state = ui::SHOW_STATE_DOCKED;
       }
     }
     work_area->SetRect(work_area_left, work_area_top,
                       std::max(0, work_area_right - work_area_left),
                       std::max(0, work_area_bottom - work_area_top));
 
     return has_prefs;
@@ skipping 351 matching lines @@
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kStartMaximized))
     return ui::SHOW_STATE_MAXIMIZED;
 
   if (browser_->initial_show_state() != ui::SHOW_STATE_DEFAULT)
     return browser_->initial_show_state();
 
   // Otherwise we use the default which can be overridden later on.
   return ui::SHOW_STATE_DEFAULT;
 }