| 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/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| 11 #include "chrome/browser/ui/browser_window.h" | 11 #include "chrome/browser/ui/browser_window.h" |
| 12 #include "ui/aura/root_window.h" | |
| 13 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" |
| 13 #include "ui/aura/window_event_dispatcher.h" |
| 14 #include "ui/gfx/screen.h" | 14 #include "ui/gfx/screen.h" |
| 15 | 15 |
| 16 void WindowSizer::GetTabbedBrowserBoundsAsh( | 16 void WindowSizer::GetTabbedBrowserBoundsAsh( |
| 17 gfx::Rect* bounds_in_screen, | 17 gfx::Rect* bounds_in_screen, |
| 18 ui::WindowShowState* show_state) const { | 18 ui::WindowShowState* show_state) const { |
| 19 DCHECK(show_state); | 19 DCHECK(show_state); |
| 20 DCHECK(bounds_in_screen); | 20 DCHECK(bounds_in_screen); |
| 21 DCHECK(browser_->is_type_tabbed()); | 21 DCHECK(browser_->is_type_tabbed()); |
| 22 DCHECK(bounds_in_screen->IsEmpty()); | 22 DCHECK(bounds_in_screen->IsEmpty()); |
| 23 | 23 |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 browser_->window() ? browser_->window()->GetNativeWindow() : NULL; | 56 browser_->window() ? browser_->window()->GetNativeWindow() : NULL; |
| 57 | 57 |
| 58 ash::WindowPositioner::GetBoundsAndShowStateForNewWindow( | 58 ash::WindowPositioner::GetBoundsAndShowStateForNewWindow( |
| 59 screen_, | 59 screen_, |
| 60 browser_window, | 60 browser_window, |
| 61 is_saved_bounds, | 61 is_saved_bounds, |
| 62 passed_show_state, | 62 passed_show_state, |
| 63 bounds_in_screen, | 63 bounds_in_screen, |
| 64 show_state); | 64 show_state); |
| 65 } | 65 } |
| OLD | NEW |