| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/window_sizer.h" | 5 #include "chrome/browser/ui/window_sizer/window_sizer.h" |
| 6 | 6 |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
| 9 #include "chrome/browser/prefs/pref_service.h" | 9 #include "chrome/browser/prefs/pref_service.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| 11 #include "chrome/browser/ui/ash/ash_init.h" | 11 #include "chrome/browser/ui/ash/ash_init.h" |
| 12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/browser/ui/browser_list.h" | 13 #include "chrome/browser/ui/browser_list.h" |
| 14 #include "chrome/browser/ui/browser_window.h" | 14 #include "chrome/browser/ui/browser_window.h" |
| 15 #include "chrome/browser/ui/browser_window_state.h" | 15 #include "chrome/browser/ui/browser_window_state.h" |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 328 bool WindowSizer::GetBoundsIgnoringPreviousState( | 328 bool WindowSizer::GetBoundsIgnoringPreviousState( |
| 329 const gfx::Rect& specified_bounds, | 329 const gfx::Rect& specified_bounds, |
| 330 gfx::Rect* bounds) const { | 330 gfx::Rect* bounds) const { |
| 331 #if defined(USE_ASH) | 331 #if defined(USE_ASH) |
| 332 // TODO(beng): insufficient but currently necessary. http://crbug.com/133312 | 332 // TODO(beng): insufficient but currently necessary. http://crbug.com/133312 |
| 333 if (chrome::ShouldOpenAshOnStartup()) | 333 if (chrome::ShouldOpenAshOnStartup()) |
| 334 return GetBoundsIgnoringPreviousStateAsh(specified_bounds, bounds); | 334 return GetBoundsIgnoringPreviousStateAsh(specified_bounds, bounds); |
| 335 #endif | 335 #endif |
| 336 return false; | 336 return false; |
| 337 } | 337 } |
| OLD | NEW |