Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(549)

Side by Side Diff: chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc

Issue 1920263003: Rename gfx::Display/Screen to display::Display/Screen in chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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.h"
6 #include "ash/shelf/shelf_view.h" 6 #include "ash/shelf/shelf_view.h"
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/test/shelf_test_api.h" 8 #include "ash/test/shelf_test_api.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 const views::ViewModel* view_model = shelf_view->view_model_for_test(); 54 const views::ViewModel* view_model = shelf_view->view_model_for_test();
55 55
56 EXPECT_EQ(2, view_model->view_size()); 56 EXPECT_EQ(2, view_model->view_size());
57 return view_model->view_at(1)->GetBoundsInScreen(); 57 return view_model->view_at(1)->GetBoundsInScreen();
58 } 58 }
59 59
60 void OpenBrowserUsingShelfOnRootWindow(aura::Window* root_window) { 60 void OpenBrowserUsingShelfOnRootWindow(aura::Window* root_window) {
61 ui::test::EventGenerator generator(root_window); 61 ui::test::EventGenerator generator(root_window);
62 gfx::Point center = 62 gfx::Point center =
63 GetChromeIconBoundsForRootWindow(root_window).CenterPoint(); 63 GetChromeIconBoundsForRootWindow(root_window).CenterPoint();
64 gfx::Display display = 64 display::Display display =
65 gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_window); 65 display::Screen::GetScreen()->GetDisplayNearestWindow(root_window);
66 const gfx::Point& origin = display.bounds().origin(); 66 const gfx::Point& origin = display.bounds().origin();
67 center.Offset(- origin.x(), - origin.y()); 67 center.Offset(- origin.x(), - origin.y());
68 generator.MoveMouseTo(center); 68 generator.MoveMouseTo(center);
69 generator.ClickLeftButton(); 69 generator.ClickLeftButton();
70 } 70 }
71 71
72 } // namespace 72 } // namespace
73 73
74 #if !defined(OS_CHROMEOS) 74 #if !defined(OS_CHROMEOS)
75 #define MAYBE_OpenBrowserUsingShelfOnOtherDisplay \ 75 #define MAYBE_OpenBrowserUsingShelfOnOtherDisplay \
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 EXPECT_EQ(root_windows[1], ash::Shell::GetTargetRootWindow()); 192 EXPECT_EQ(root_windows[1], ash::Shell::GetTargetRootWindow());
193 193
194 OpenBrowserUsingContextMenuOnRootWindow(root_windows[0]); 194 OpenBrowserUsingContextMenuOnRootWindow(root_windows[0]);
195 195
196 // Next new browser must be created on 1st display. 196 // Next new browser must be created on 1st display.
197 ASSERT_EQ(2u, browser_list->size()); 197 ASSERT_EQ(2u, browser_list->size());
198 EXPECT_EQ(root_windows[0], 198 EXPECT_EQ(root_windows[0],
199 browser_list->get(1)->window()->GetNativeWindow()->GetRootWindow()); 199 browser_list->get(1)->window()->GetNativeWindow()->GetRootWindow());
200 EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow()); 200 EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());
201 } 201 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/window_sizer/window_sizer_ash.cc ('k') | chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698