More cleanup in window_sizer/window_sizer_ash

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 80 matching lines @@
       return false;
 
     // If a reference browser is set, use its window. Otherwise find last
     // active. Panels are never used as reference browsers as panels are
     // specially positioned.
     BrowserWindow* window = NULL;
     // Window may be null if browser is just starting up.
     if (browser_ && browser_->window()) {
       window = browser_->window();
     } else {
-      // This code is only ran on the native desktop (on the ash desktop,
-      // GetBoundsOverrideAsh should take over below before this is reached).
-      // TODO(gab): This code should go in a native desktop specific window
-      // sizer as part of fixing crbug.com/175812.
+      // This code is only ran on the native desktop (on the ash
+      // desktop, GetTabbedBrowserBoundsAsh should take over below
+      // before this is reached).  TODO(gab): This code should go in a
+      // native desktop specific window sizer as part of fixing
+      // crbug.com/175812.
       const BrowserList* native_browser_list =
           BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE);
       for (BrowserList::const_reverse_iterator it =
                native_browser_list->begin_last_active();
            it != native_browser_list->end_last_active(); ++it) {
         Browser* last_active = *it;
         if (last_active && last_active->is_type_tabbed()) {
           window = last_active->window();
           DCHECK(window);
           break;
@@ skipping 71 matching lines @@
     gfx::Rect* bounds,
     ui::WindowShowState* show_state) const {
   DCHECK(bounds);
   DCHECK(show_state);
   // Pre-populate the window state with our default.
   *show_state = GetWindowDefaultShowState();
   *bounds = specified_bounds;
   if (bounds->IsEmpty()) {
 #if defined(USE_ASH)
     // See if ash should decide the window placement.
-    // TODO(beng): insufficient but currently necessary.
-    // http://crbug.com/133312
-    if (chrome::ShouldOpenAshOnStartup() &&
-        GetBoundsOverrideAsh(bounds, show_state))
+    if (IsTabbedBrowserInAsh()) {
+      GetTabbedBrowserBoundsAsh(bounds, show_state);
       return;
+    } else if (chrome::ShouldOpenAshOnStartup() &&
+               browser_ && browser_->host_desktop_type() ==
+               chrome::HOST_DESKTOP_TYPE_ASH) {
+      // Saved bounds's show state takes precedence over one in last
+      // bounds in ash.  If you have a question or an issue, please
+      // contact oshima@chromium.org.
+      GetSavedWindowBounds(bounds, show_state);
+    }
 #endif
     // See if there's last active window's placement information.
     if (GetLastWindowBounds(bounds, show_state))
       return;
     // See if there's saved placement information.
     if (GetSavedWindowBounds(bounds, show_state))
       return;
     // No saved placement, figure out some sensible default size based on
     // the user's screen size.
     GetDefaultWindowBounds(bounds);
   } else {
 #if defined(USE_ASH)
     // In case of a popup with an 'unspecified' location in ash, we are
     // looking for a good screen location. We are interpreting (0,0) as an
     // unspecified location.
-    if (chrome::ShouldOpenAshOnStartup() &&
-        browser_ && browser_->is_type_popup() &&
-        bounds->x() == 0 && bounds->y() == 0) {
+    if (IsPopupBrowserInAsh() && bounds->origin().IsOrigin()) {
       *bounds = ChromeShellDelegate::instance()->window_positioner()->
           GetPopupPosition(*bounds);
       return;
     }
 #endif
     // In case that there was a bound given we need to make sure that it is
     // visible and fits on the screen.
     // Find the size of the work area of the monitor that intersects the bounds
     // of the anchor window. Note: AdjustBoundsToBeVisibleOnMonitorContaining
     // does not exactly what we want: It makes only sure that "a minimal part"
@@ skipping 163 matching lines @@
 
   if (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;
 }
+
+#if defined(USE_ASH)
+bool WindowSizer::IsTabbedBrowserInAsh() const {
+  // TODO(beng): insufficient but currently necessary. http://crbug.com/133312
+  return chrome::ShouldOpenAshOnStartup() &&
+      browser_ &&
+      browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH &&
+      browser_->is_type_tabbed();
+}
+
+bool WindowSizer::IsPopupBrowserInAsh() const {
+  // TODO(beng): insufficient but currently necessary. http://crbug.com/133312
+  return chrome::ShouldOpenAshOnStartup() &&
+      browser_ &&
+      browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH &&
+      browser_->is_type_popup();
+}
+#endif