More cleanup in window_sizer/window_sizer_ash

chrome/browser/ui/window_sizer/window_sizer.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WINDOW_SIZER_WINDOW_SIZER_H_
 #define CHROME_BROWSER_UI_WINDOW_SIZER_WINDOW_SIZER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/host_desktop.h"
@@ skipping 137 matching lines @@
   // If |saved_work_area| is non-empty, it is used to determine whether the
   // monitor configuration has changed. If it has, bounds are repositioned and
   // resized if necessary to make them completely contained in the current work
   // area.
   void AdjustBoundsToBeVisibleOnMonitorContaining(
       const gfx::Rect& other_bounds,
       const gfx::Rect& saved_work_area,
       gfx::Rect* bounds) const;
 
 #if defined(USE_ASH)
-  // Determines the position and size for an ash window as it gets created. This
-  // will be called before other standard placement logic. It will return true
-  // when the function was setting the bounds structure to the desired size.
-  // Otherwise another algorithm should get used to determine the correct
-  // bounds. |show_state| will only be changed if it was set to
-  // SHOW_STATE_DEFAULT.
-  bool GetBoundsOverrideAsh(gfx::Rect* bounds_in_screen,
-                            ui::WindowShowState* show_state) const;
+  // Determines the position and size for a tabbed browser window in
+  // ash as it gets created. This will be called before other standard
+  // placement logic. |show_state| will only be changed
+  // if it was set to SHOW_STATE_DEFAULT.
+  void GetTabbedBrowserBoundsAsh(gfx::Rect* bounds_in_screen,
+                                 ui::WindowShowState* show_state) const;
 #endif
 
   // Determine the default show state for the window - not looking at other
   // windows or at persistent information.
   ui::WindowShowState GetWindowDefaultShowState() const;
 
+#if defined(USE_ASH)
+  bool IsTabbedBrowserInAsh() const;
+  bool IsPopupBrowserInAsh() const;
+#endif
+
   // Providers for persistent storage and monitor metrics.
   scoped_ptr<StateProvider> state_provider_;
   gfx::Screen* screen_;  // not owned.
 
   // Note that this browser handle might be NULL.
   const Browser* browser_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowSizer);
 };
 
 #endif  // CHROME_BROWSER_UI_WINDOW_SIZER_WINDOW_SIZER_H_