| 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/window_sizer.h" | 5 #include "chrome/browser/ui/window_sizer/window_sizer.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/wm/window_positioner.h" | 8 #include "ash/wm/window_positioner.h" |
| 9 #include "ash/wm/window_state.h" | 9 #include "ash/wm/window_state.h" |
| 10 #include "chrome/browser/ui/ash/ash_util.h" | 10 #include "chrome/browser/ui/ash/ash_util.h" |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 bounds_in_screen->AdjustToFit(display.work_area()); | 102 bounds_in_screen->AdjustToFit(display.work_area()); |
| 103 return; | 103 return; |
| 104 } | 104 } |
| 105 | 105 |
| 106 // The |browser_window| is non NULL when this is called after | 106 // The |browser_window| is non NULL when this is called after |
| 107 // browser's aura window is created. | 107 // browser's aura window is created. |
| 108 aura::Window* browser_window = | 108 aura::Window* browser_window = |
| 109 browser_->window() ? browser_->window()->GetNativeWindow() : NULL; | 109 browser_->window() ? browser_->window()->GetNativeWindow() : NULL; |
| 110 | 110 |
| 111 ash::WindowPositioner::GetBoundsAndShowStateForNewWindow( | 111 ash::WindowPositioner::GetBoundsAndShowStateForNewWindow( |
| 112 screen_, | 112 ash::wm::WmWindowAura::Get(browser_window), is_saved_bounds, |
| 113 browser_window, | 113 passed_show_state, bounds_in_screen, show_state); |
| 114 is_saved_bounds, | |
| 115 passed_show_state, | |
| 116 bounds_in_screen, | |
| 117 show_state); | |
| 118 } | 114 } |
| OLD | NEW |