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

Side by Side Diff: ash/display/window_tree_host_manager_unittest.cc

Issue 2694623016: chromeos: Makes AshTestBase/Helper target mash when appropriate (Closed)
Patch Set: feedback Created 3 years, 10 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
« no previous file with comments | « ash/common/system/tray/tray_details_view_unittest.cc ('k') | ash/mus/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "ash/display/window_tree_host_manager.h" 5 #include "ash/display/window_tree_host_manager.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/common/shelf/shelf_widget.h" 9 #include "ash/common/shelf/shelf_widget.h"
10 #include "ash/common/shelf/wm_shelf.h" 10 #include "ash/common/shelf/wm_shelf.h"
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 int activation_changed_count_; 178 int activation_changed_count_;
179 179
180 DISALLOW_COPY_AND_ASSIGN(TestObserver); 180 DISALLOW_COPY_AND_ASSIGN(TestObserver);
181 }; 181 };
182 182
183 display::Display GetPrimaryDisplay() { 183 display::Display GetPrimaryDisplay() {
184 return display::Screen::GetScreen()->GetDisplayNearestWindow( 184 return display::Screen::GetScreen()->GetDisplayNearestWindow(
185 Shell::GetAllRootWindows()[0]); 185 Shell::GetAllRootWindows()[0]);
186 } 186 }
187 187
188 display::Display GetSecondaryDisplay() {
189 return display::Screen::GetScreen()->GetDisplayNearestWindow(
190 Shell::GetAllRootWindows()[1]);
191 }
192
193 class TestHelper { 188 class TestHelper {
194 public: 189 public:
195 explicit TestHelper(test::AshTestBase* delegate); 190 explicit TestHelper(test::AshTestBase* delegate);
196 ~TestHelper(); 191 ~TestHelper();
197 192
198 void SetSecondaryDisplayLayoutAndOffset( 193 void SetSecondaryDisplayLayoutAndOffset(
199 display::DisplayPlacement::Position position, 194 display::DisplayPlacement::Position position,
200 int offset); 195 int offset);
201 196
202 void SetSecondaryDisplayLayout(display::DisplayPlacement::Position position); 197 void SetSecondaryDisplayLayout(display::DisplayPlacement::Position position);
(...skipping 1511 matching lines...) Expand 10 before | Expand all | Expand 10 after
1714 widget->GetNativeWindow()->GetRootWindow()); 1709 widget->GetNativeWindow()->GetRootWindow());
1715 event_generator.MoveMouseToCenterOf(widget->GetNativeWindow()); 1710 event_generator.MoveMouseToCenterOf(widget->GetNativeWindow());
1716 1711
1717 UpdateDisplay("300x300"); 1712 UpdateDisplay("300x300");
1718 watcher.Stop(); 1713 watcher.Stop();
1719 1714
1720 widget->CloseNow(); 1715 widget->CloseNow();
1721 } 1716 }
1722 1717
1723 } // namespace ash 1718 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/tray_details_view_unittest.cc ('k') | ash/mus/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698