OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "ash/shelf/shelf.h" |
5 #include "ash/shelf/shelf_view.h" | 6 #include "ash/shelf/shelf_view.h" |
6 #include "ash/shelf/wm_shelf.h" | |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/wm_window.h" | 8 #include "ash/wm_window.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
13 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
14 #include "base/single_thread_task_runner.h" | 14 #include "base/single_thread_task_runner.h" |
15 #include "base/threading/thread_task_runner_handle.h" | 15 #include "base/threading/thread_task_runner_handle.h" |
16 #include "build/build_config.h" | 16 #include "build/build_config.h" |
(...skipping 30 matching lines...) Expand all Loading... |
47 DISALLOW_COPY_AND_ASSIGN(WindowSizerTest); | 47 DISALLOW_COPY_AND_ASSIGN(WindowSizerTest); |
48 }; | 48 }; |
49 | 49 |
50 void CloseBrowser(Browser* browser) { | 50 void CloseBrowser(Browser* browser) { |
51 browser->window()->Close(); | 51 browser->window()->Close(); |
52 base::RunLoop().RunUntilIdle(); | 52 base::RunLoop().RunUntilIdle(); |
53 } | 53 } |
54 | 54 |
55 gfx::Rect GetChromeIconBoundsForRootWindow(aura::Window* root_window) { | 55 gfx::Rect GetChromeIconBoundsForRootWindow(aura::Window* root_window) { |
56 const ash::ShelfView* shelf_view = | 56 const ash::ShelfView* shelf_view = |
57 ash::WmShelf::ForWindow(root_window)->GetShelfViewForTesting(); | 57 ash::Shelf::ForWindow(root_window)->GetShelfViewForTesting(); |
58 const views::ViewModel* view_model = shelf_view->view_model_for_test(); | 58 const views::ViewModel* view_model = shelf_view->view_model_for_test(); |
59 | 59 |
60 EXPECT_EQ(2, view_model->view_size()); | 60 EXPECT_EQ(2, view_model->view_size()); |
61 return view_model->view_at(1)->GetBoundsInScreen(); | 61 return view_model->view_at(1)->GetBoundsInScreen(); |
62 } | 62 } |
63 | 63 |
64 void OpenBrowserUsingShelfOnRootWindow(aura::Window* root_window) { | 64 void OpenBrowserUsingShelfOnRootWindow(aura::Window* root_window) { |
65 ui::test::EventGenerator generator(root_window); | 65 ui::test::EventGenerator generator(root_window); |
66 gfx::Point center = | 66 gfx::Point center = |
67 GetChromeIconBoundsForRootWindow(root_window).CenterPoint(); | 67 GetChromeIconBoundsForRootWindow(root_window).CenterPoint(); |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 | 198 |
199 CloseBrowser(browser_list->get(0)); | 199 CloseBrowser(browser_list->get(0)); |
200 OpenBrowserUsingContextMenuOnRootWindow(root_windows[0]); | 200 OpenBrowserUsingContextMenuOnRootWindow(root_windows[0]); |
201 | 201 |
202 // Next new browser must be created on 1st display. | 202 // Next new browser must be created on 1st display. |
203 ASSERT_EQ(1u, browser_list->size()); | 203 ASSERT_EQ(1u, browser_list->size()); |
204 EXPECT_EQ(root_windows[0], | 204 EXPECT_EQ(root_windows[0], |
205 browser_list->get(0)->window()->GetNativeWindow()->GetRootWindow()); | 205 browser_list->get(0)->window()->GetNativeWindow()->GetRootWindow()); |
206 EXPECT_EQ(root_windows[0], ash::Shell::GetRootWindowForNewWindows()); | 206 EXPECT_EQ(root_windows[0], ash::Shell::GetRootWindowForNewWindows()); |
207 } | 207 } |
OLD | NEW |