| Index: chrome/browser/ui/window_sizer/window_sizer.h
|
| diff --git a/chrome/browser/ui/window_sizer/window_sizer.h b/chrome/browser/ui/window_sizer/window_sizer.h
|
| index 7648104460dff4c2d54f07d597c5b8f3d7b531c3..c11a8a386ae659488490b03b1c15a7c307806685 100644
|
| --- a/chrome/browser/ui/window_sizer/window_sizer.h
|
| +++ b/chrome/browser/ui/window_sizer/window_sizer.h
|
| @@ -155,13 +155,11 @@ class WindowSizer {
|
| 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,
|
| + // 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 GetBoundsOverrideAsh(gfx::Rect* bounds_in_screen,
|
| ui::WindowShowState* show_state) const;
|
| #endif
|
|
|
| @@ -169,6 +167,9 @@ class WindowSizer {
|
| // windows or at persistent information.
|
| ui::WindowShowState GetWindowDefaultShowState() const;
|
|
|
| + bool IsTabbedBrowserInAsh() const;
|
| + bool IsPopupBrowserInAsh() const;
|
| +
|
| // Providers for persistent storage and monitor metrics.
|
| scoped_ptr<StateProvider> state_provider_;
|
| gfx::Screen* screen_; // not owned.
|
|
|