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