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

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

Issue 2361283002: Add GetDisplayWithDisplayId to display::Screen. (Closed)
Patch Set: test Created 4 years, 3 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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 209
210 // static 210 // static
211 bool AshTestBase::SupportsHostWindowResize() { 211 bool AshTestBase::SupportsHostWindowResize() {
212 return AshTestHelper::SupportsHostWindowResize(); 212 return AshTestHelper::SupportsHostWindowResize();
213 } 213 }
214 214
215 void AshTestBase::UpdateDisplay(const std::string& display_specs) { 215 void AshTestBase::UpdateDisplay(const std::string& display_specs) {
216 DisplayManagerTestApi().UpdateDisplay(display_specs); 216 DisplayManagerTestApi().UpdateDisplay(display_specs);
217 } 217 }
218 218
219 int64_t AshTestBase::SetFirstDisplayAsInternalDisplay() {
220 return DisplayManagerTestApi().SetFirstDisplayAsInternalDisplay();
221 }
222
219 aura::Window* AshTestBase::CurrentContext() { 223 aura::Window* AshTestBase::CurrentContext() {
220 return ash_test_helper_->CurrentContext(); 224 return ash_test_helper_->CurrentContext();
221 } 225 }
222 226
223 // static 227 // static
224 std::unique_ptr<views::Widget> AshTestBase::CreateTestWidget( 228 std::unique_ptr<views::Widget> AshTestBase::CreateTestWidget(
225 views::WidgetDelegate* delegate, 229 views::WidgetDelegate* delegate,
226 int container_id, 230 int container_id,
227 const gfx::Rect& bounds) { 231 const gfx::Rect& bounds) {
228 std::unique_ptr<views::Widget> widget(new views::Widget); 232 std::unique_ptr<views::Widget> widget(new views::Widget);
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 375
372 void AshTestBase::DisableIME() { 376 void AshTestBase::DisableIME() {
373 Shell::GetInstance()->RemovePreTargetHandler( 377 Shell::GetInstance()->RemovePreTargetHandler(
374 Shell::GetInstance() 378 Shell::GetInstance()
375 ->window_tree_host_manager() 379 ->window_tree_host_manager()
376 ->input_method_event_handler()); 380 ->input_method_event_handler());
377 } 381 }
378 382
379 } // namespace test 383 } // namespace test
380 } // namespace ash 384 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698