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

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

Issue 2523723002: Update display::Display::kInvalidDisplayID constant. (Closed)
Patch Set: Fix includes. Created 4 years 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 "ui/display/manager/display_manager.h" 5 #include "ui/display/manager/display_manager.h"
6 6
7 #include "ash/accelerators/accelerator_commands_aura.h" 7 #include "ash/accelerators/accelerator_commands_aura.h"
8 #include "ash/common/material_design/material_design_controller.h" 8 #include "ash/common/material_design/material_design_controller.h"
9 #include "ash/common/wm/window_state.h" 9 #include "ash/common/wm/window_state.h"
10 #include "ash/display/display_configuration_controller.h" 10 #include "ash/display/display_configuration_controller.h"
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 info.SetBounds(bounds); 649 info.SetBounds(bounds);
650 return info; 650 return info;
651 } 651 }
652 652
653 TEST_P(DisplayManagerTest, TestNativeDisplaysChanged) { 653 TEST_P(DisplayManagerTest, TestNativeDisplaysChanged) {
654 const int64_t internal_display_id = 654 const int64_t internal_display_id =
655 display::test::DisplayManagerTestApi(display_manager()) 655 display::test::DisplayManagerTestApi(display_manager())
656 .SetFirstDisplayAsInternalDisplay(); 656 .SetFirstDisplayAsInternalDisplay();
657 const int external_id = 10; 657 const int external_id = 10;
658 const int mirror_id = 11; 658 const int mirror_id = 11;
659 const int64_t invalid_id = display::Display::kInvalidDisplayID; 659 const int64_t invalid_id = display::kInvalidDisplayId;
660 const display::ManagedDisplayInfo internal_display_info = 660 const display::ManagedDisplayInfo internal_display_info =
661 CreateDisplayInfo(internal_display_id, gfx::Rect(0, 0, 500, 500)); 661 CreateDisplayInfo(internal_display_id, gfx::Rect(0, 0, 500, 500));
662 const display::ManagedDisplayInfo external_display_info = 662 const display::ManagedDisplayInfo external_display_info =
663 CreateDisplayInfo(external_id, gfx::Rect(1, 1, 100, 100)); 663 CreateDisplayInfo(external_id, gfx::Rect(1, 1, 100, 100));
664 const display::ManagedDisplayInfo mirroring_display_info = 664 const display::ManagedDisplayInfo mirroring_display_info =
665 CreateDisplayInfo(mirror_id, gfx::Rect(0, 0, 500, 500)); 665 CreateDisplayInfo(mirror_id, gfx::Rect(0, 0, 500, 500));
666 666
667 EXPECT_EQ(1U, display_manager()->GetNumDisplays()); 667 EXPECT_EQ(1U, display_manager()->GetNumDisplays());
668 EXPECT_EQ(1U, display_manager()->num_connected_displays()); 668 EXPECT_EQ(1U, display_manager()->num_connected_displays());
669 std::string default_bounds = 669 std::string default_bounds =
(...skipping 1808 matching lines...) Expand 10 before | Expand all | Expand 10 after
2478 const display::DisplayLayout& stored = 2478 const display::DisplayLayout& stored =
2479 layout_store->GetRegisteredDisplayLayout(list); 2479 layout_store->GetRegisteredDisplayLayout(list);
2480 2480
2481 EXPECT_EQ(id1, stored.placement_list[0].parent_display_id); 2481 EXPECT_EQ(id1, stored.placement_list[0].parent_display_id);
2482 EXPECT_EQ(id2, stored.placement_list[0].display_id); 2482 EXPECT_EQ(id2, stored.placement_list[0].display_id);
2483 } 2483 }
2484 2484
2485 #endif // OS_CHROMEOS 2485 #endif // OS_CHROMEOS
2486 2486
2487 } // namespace ash 2487 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/display_color_manager_chromeos.cc ('k') | ash/display/extended_mouse_warp_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698