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

Side by Side Diff: ash/test/ash_test_base.cc

Issue 2361283002: Add GetDisplayWithDisplayId to display::Screen. (Closed)
Patch Set: id Created 4 years, 2 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 (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/test/ash_test_base.h" 5 #include "ash/test/ash_test_base.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/wm/window_positioner.h" 10 #include "ash/common/wm/window_positioner.h"
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 // static 205 // static
206 bool AshTestBase::SupportsMultipleDisplays() { 206 bool AshTestBase::SupportsMultipleDisplays() {
207 return AshTestHelper::SupportsMultipleDisplays(); 207 return AshTestHelper::SupportsMultipleDisplays();
208 } 208 }
209 209
210 // static 210 // static
211 void AshTestBase::UpdateDisplay(const std::string& display_specs) { 211 void AshTestBase::UpdateDisplay(const std::string& display_specs) {
212 DisplayManagerTestApi().UpdateDisplay(display_specs); 212 DisplayManagerTestApi().UpdateDisplay(display_specs);
213 } 213 }
214 214
215 int64_t AshTestBase::SetFirstDisplayAsInternalDisplay() {
216 return DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
217 }
218
215 aura::Window* AshTestBase::CurrentContext() { 219 aura::Window* AshTestBase::CurrentContext() {
216 return ash_test_helper_->CurrentContext(); 220 return ash_test_helper_->CurrentContext();
217 } 221 }
218 222
219 // static 223 // static
220 std::unique_ptr<views::Widget> AshTestBase::CreateTestWidget( 224 std::unique_ptr<views::Widget> AshTestBase::CreateTestWidget(
221 views::WidgetDelegate* delegate, 225 views::WidgetDelegate* delegate,
222 int container_id, 226 int container_id,
223 const gfx::Rect& bounds) { 227 const gfx::Rect& bounds) {
224 std::unique_ptr<views::Widget> widget(new views::Widget); 228 std::unique_ptr<views::Widget> widget(new views::Widget);
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 371
368 void AshTestBase::DisableIME() { 372 void AshTestBase::DisableIME() {
369 Shell::GetInstance()->RemovePreTargetHandler( 373 Shell::GetInstance()->RemovePreTargetHandler(
370 Shell::GetInstance() 374 Shell::GetInstance()
371 ->window_tree_host_manager() 375 ->window_tree_host_manager()
372 ->input_method_event_handler()); 376 ->input_method_event_handler());
373 } 377 }
374 378
375 } // namespace test 379 } // namespace test
376 } // namespace ash 380 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698