| 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/aura/wm_window_aura.h" |
| 8 #include "ash/wm/window_positioner.h" | 9 #include "ash/wm/window_positioner.h" |
| 9 #include "ash/wm/window_state.h" | 10 #include "ash/wm/window_state.h" |
| 10 #include "chrome/browser/ui/ash/ash_util.h" | 11 #include "chrome/browser/ui/ash/ash_util.h" |
| 11 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 12 #include "chrome/browser/ui/browser_window.h" | 13 #include "chrome/browser/ui/browser_window.h" |
| 13 #include "ui/aura/window.h" | 14 #include "ui/aura/window.h" |
| 14 #include "ui/aura/window_event_dispatcher.h" | 15 #include "ui/aura/window_event_dispatcher.h" |
| 15 #include "ui/gfx/screen.h" | 16 #include "ui/gfx/screen.h" |
| 16 | 17 |
| 17 bool WindowSizer::GetBrowserBoundsAsh(gfx::Rect* bounds, | 18 bool WindowSizer::GetBrowserBoundsAsh(gfx::Rect* bounds, |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 | 106 |
| 106 // The |browser_window| is non NULL when this is called after | 107 // The |browser_window| is non NULL when this is called after |
| 107 // browser's aura window is created. | 108 // browser's aura window is created. |
| 108 aura::Window* browser_window = | 109 aura::Window* browser_window = |
| 109 browser_->window() ? browser_->window()->GetNativeWindow() : NULL; | 110 browser_->window() ? browser_->window()->GetNativeWindow() : NULL; |
| 110 | 111 |
| 111 ash::WindowPositioner::GetBoundsAndShowStateForNewWindow( | 112 ash::WindowPositioner::GetBoundsAndShowStateForNewWindow( |
| 112 ash::wm::WmWindowAura::Get(browser_window), is_saved_bounds, | 113 ash::wm::WmWindowAura::Get(browser_window), is_saved_bounds, |
| 113 passed_show_state, bounds_in_screen, show_state); | 114 passed_show_state, bounds_in_screen, show_state); |
| 114 } | 115 } |
| OLD | NEW |