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

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

Issue 2084533008: mash: Migrate tray audio and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 6 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
« no previous file with comments | « ash/display/display_change_observer_chromeos.cc ('k') | ash/display/display_info.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/common/display/display_info.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.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/test/test_display_snapshot.h" 11 #include "ui/display/chromeos/test/test_display_snapshot.h"
12 #include "ui/display/types/display_mode.h" 12 #include "ui/display/types/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
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 EXPECT_FALSE(display_modes[0].native); 409 EXPECT_FALSE(display_modes[0].native);
410 EXPECT_EQ(display_modes[0].refresh_rate, 60); 410 EXPECT_EQ(display_modes[0].refresh_rate, 60);
411 411
412 EXPECT_EQ("1920x1080", display_modes[1].size.ToString()); 412 EXPECT_EQ("1920x1080", display_modes[1].size.ToString());
413 EXPECT_TRUE(display_modes[1].interlaced); 413 EXPECT_TRUE(display_modes[1].interlaced);
414 EXPECT_TRUE(display_modes[1].native); 414 EXPECT_TRUE(display_modes[1].native);
415 EXPECT_EQ(display_modes[1].refresh_rate, 60); 415 EXPECT_EQ(display_modes[1].refresh_rate, 60);
416 } 416 }
417 417
418 } // namespace ash 418 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/display_change_observer_chromeos.cc ('k') | ash/display/display_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698