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

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

Issue 12505005: Store rotation/ui scale to local state. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
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/display_manager.h" 5 #include "ash/display/display_manager.h"
6 6
7 #include "ash/display/display_controller.h" 7 #include "ash/display/display_controller.h"
8 #include "ash/screen_ash.h" 8 #include "ash/screen_ash.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 added_.clear(); 62 added_.clear();
63 removed_count_ = 0U; 63 removed_count_ = 0U;
64 root_window_destroyed_ = false; 64 root_window_destroyed_ = false;
65 } 65 }
66 66
67 bool root_window_destroyed() const { 67 bool root_window_destroyed() const {
68 return root_window_destroyed_; 68 return root_window_destroyed_;
69 } 69 }
70 70
71 const DisplayInfo& GetDisplayInfo(const gfx::Display& display) { 71 const DisplayInfo& GetDisplayInfo(const gfx::Display& display) {
72 return display_manager()->GetDisplayInfo(display); 72 return display_manager()->GetDisplayInfo(display.id());
73 } 73 }
74 74
75 const DisplayInfo& GetDisplayInfoAt(int index) { 75 const DisplayInfo& GetDisplayInfoAt(int index) {
76 return GetDisplayInfo(*display_manager()->GetDisplayAt(index)); 76 return GetDisplayInfo(*display_manager()->GetDisplayAt(index));
77 } 77 }
78 78
79 const gfx::Display& FindDisplayForId(int64 id) { 79 const gfx::Display& FindDisplayForId(int64 id) {
80 return display_manager()->FindDisplayForId(id); 80 return display_manager()->FindDisplayForId(id);
81 } 81 }
82 82
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
680 GetDisplayInfoAt(0).size_in_pixel().ToString()); 680 GetDisplayInfoAt(0).size_in_pixel().ToString());
681 681
682 EXPECT_EQ("1,201 300x400", 682 EXPECT_EQ("1,201 300x400",
683 GetDisplayInfoAt(1).bounds_in_pixel().ToString()); 683 GetDisplayInfoAt(1).bounds_in_pixel().ToString());
684 EXPECT_EQ("300x400", 684 EXPECT_EQ("300x400",
685 GetDisplayInfoAt(1).size_in_pixel().ToString()); 685 GetDisplayInfoAt(1).size_in_pixel().ToString());
686 } 686 }
687 687
688 } // namespace internal 688 } // namespace internal
689 } // namespace ash 689 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698