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

Side by Side Diff: ash/mus/test/wm_test_base.cc

Issue 2653593004: chromeos: Remove AshTestBase::SupportsMultipleDisplays (Closed)
Patch Set: Created 3 years, 11 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/mus/test/wm_test_base.h ('k') | ash/mus/top_level_window_factory_unittest.cc » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/mus/test/wm_test_base.h" 5 #include "ash/mus/test/wm_test_base.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/session/session_controller.h" 10 #include "ash/common/session/session_controller.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 61
62 WmTestBase::WmTestBase() {} 62 WmTestBase::WmTestBase() {}
63 63
64 WmTestBase::~WmTestBase() { 64 WmTestBase::~WmTestBase() {
65 CHECK(setup_called_) 65 CHECK(setup_called_)
66 << "You have overridden SetUp but never called WmTestBase::SetUp"; 66 << "You have overridden SetUp but never called WmTestBase::SetUp";
67 CHECK(teardown_called_) 67 CHECK(teardown_called_)
68 << "You have overridden TearDown but never called WmTestBase::TearDown"; 68 << "You have overridden TearDown but never called WmTestBase::TearDown";
69 } 69 }
70 70
71 bool WmTestBase::SupportsMultipleDisplays() const {
72 return true;
73 }
74
75 void WmTestBase::UpdateDisplay(const std::string& display_spec) { 71 void WmTestBase::UpdateDisplay(const std::string& display_spec) {
76 test_helper_->UpdateDisplay(display_spec); 72 test_helper_->UpdateDisplay(display_spec);
77 } 73 }
78 74
79 aura::Window* WmTestBase::GetPrimaryRootWindow() { 75 aura::Window* WmTestBase::GetPrimaryRootWindow() {
80 std::vector<RootWindowController*> roots = 76 std::vector<RootWindowController*> roots =
81 test_helper_->GetRootsOrderedByDisplayId(); 77 test_helper_->GetRootsOrderedByDisplayId();
82 DCHECK(!roots.empty()); 78 DCHECK(!roots.empty());
83 return roots[0]->GetRootWindow(); 79 return roots[0]->GetRootWindow();
84 } 80 }
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 info->can_lock_screen = true; 198 info->can_lock_screen = true;
203 info->should_lock_screen_automatically = false; 199 info->should_lock_screen_automatically = false;
204 info->add_user_session_policy = AddUserSessionPolicy::ALLOWED; 200 info->add_user_session_policy = AddUserSessionPolicy::ALLOWED;
205 info->state = session_manager::SessionState::ACTIVE; 201 info->state = session_manager::SessionState::ACTIVE;
206 session_controller->SetSessionInfo(std::move(info)); 202 session_controller->SetSessionInfo(std::move(info));
207 } 203 }
208 204
209 205
210 } // namespace mus 206 } // namespace mus
211 } // namespace ash 207 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/test/wm_test_base.h ('k') | ash/mus/top_level_window_factory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698