ash/display/display_change_observer_chromeos_unittest.cc - Issue 230763004: Split ui/display types into separate module and have Ozone depend on it

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 230763004: Split ui/display types into separate module and have Ozone depend on it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: display_types has ony CrOS, so include it only if chromeos==1 Created 6 years, 8 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

« ash/ash.gyp ('K') | « ash/display/display_change_observer_chromeos.cc ('k') | ash/display/display_info.h » ('j') | ui/display/types/DEPS » ('J')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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_change_observer_chromeos.h"	5 #include "ash/display/display_change_observer_chromeos.h"

6	6

7 #include "ash/display/display_info.h"	7 #include "ash/display/display_info.h"

8 #include "base/memory/scoped_vector.h"	8 #include "base/memory/scoped_vector.h"

9 #include "testing/gtest/include/gtest/gtest.h"	9 #include "testing/gtest/include/gtest/gtest.h"

10 #include "ui/display/chromeos/display_configurator.h"	10 #include "ui/display/chromeos/display_configurator.h"

11 #include "ui/display/chromeos/display_mode.h"

12 #include "ui/display/chromeos/test/test_display_snapshot.h"	11 #include "ui/display/chromeos/test/test_display_snapshot.h"

	12 #include "ui/display/types/chromeos/display_mode.h"

13	13

14 using ui::DisplayConfigurator;	14 using ui::DisplayConfigurator;

15	15

16 typedef testing::Test DisplayChangeObserverTest;	16 typedef testing::Test DisplayChangeObserverTest;

17	17

18 namespace ash {	18 namespace ash {

19	19

20 TEST_F(DisplayChangeObserverTest, GetDisplayModeList) {	20 TEST_F(DisplayChangeObserverTest, GetDisplayModeList) {

21 ScopedVector<const ui::DisplayMode> modes;	21 ScopedVector<const ui::DisplayMode> modes;

22 modes.push_back(new ui::DisplayMode(gfx::Size(1920, 1200), false, 60));	22 modes.push_back(new ui::DisplayMode(gfx::Size(1920, 1200), false, 60));

(...skipping 53 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
76	76

77 // Outputs without any modes shouldn't cause a crash.	77 // Outputs without any modes shouldn't cause a crash.

78 modes.clear();	78 modes.clear();

79 display_snapshot.set_modes(modes.get());	79 display_snapshot.set_modes(modes.get());

80	80

81 display_modes = DisplayChangeObserver::GetDisplayModeList(output);	81 display_modes = DisplayChangeObserver::GetDisplayModeList(output);

82 EXPECT_EQ(0u, display_modes.size());	82 EXPECT_EQ(0u, display_modes.size());

83 }	83 }

84	84

85 } // namespace ash	85 } // namespace ash

OLD	NEW