Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / window_sizer / window_sizer.h

diff --git a/src/chrome/browser/ui/window_sizer/window_sizer.h b/src/chrome/browser/ui/window_sizer/window_sizer.h
index a7a7dd0..e9ec7ea 100644 (file)
--- a/src/chrome/browser/ui/window_sizer/window_sizer.h
+++ b/src/chrome/browser/ui/window_sizer/window_sizer.h
@@ -160,11 +160,17 @@ class WindowSizer {
   gfx::Display GetTargetDisplay(const gfx::Rect& bounds) const;
 
 #if defined(USE_ASH)
+  // Ash specific logic for window placement. Returns true if |bounds| and
+  // |show_state| have been fully determined, otherwise returns false (but
+  // may still affect |show_state|).
+  bool GetBrowserBoundsAsh(gfx::Rect* bounds,
+                           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,
+  void GetTabbedBrowserBoundsAsh(gfx::Rect* bounds,
                                  ui::WindowShowState* show_state) const;
 #endif
 
@@ -172,11 +178,6 @@ class WindowSizer {
   // 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_;
   scoped_ptr<TargetDisplayProvider> target_display_provider_;