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

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

Issue 2355063002: Separate ash::test::DisplayManagerTestApi from ash (Closed)
Patch Set: review comment Created 4 years, 2 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_manager.h ('k') | ash/display/display_manager_unittest.cc » ('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 (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 <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <limits> 9 #include <limits>
10 #include <map> 10 #include <map>
(...skipping 1415 matching lines...) Expand 10 before | Expand all | Expand 10 after
1426 } 1426 }
1427 1427
1428 void DisplayManager::AddObserver(display::DisplayObserver* observer) { 1428 void DisplayManager::AddObserver(display::DisplayObserver* observer) {
1429 observers_.AddObserver(observer); 1429 observers_.AddObserver(observer);
1430 } 1430 }
1431 1431
1432 void DisplayManager::RemoveObserver(display::DisplayObserver* observer) { 1432 void DisplayManager::RemoveObserver(display::DisplayObserver* observer) {
1433 observers_.RemoveObserver(observer); 1433 observers_.RemoveObserver(observer);
1434 } 1434 }
1435 1435
1436 const display::Display& DisplayManager::GetSecondaryDisplay() const {
1437 CHECK_LE(2U, GetNumDisplays());
1438 return GetDisplayAt(0).id() ==
1439 display::Screen::GetScreen()->GetPrimaryDisplay().id()
1440 ? GetDisplayAt(1)
1441 : GetDisplayAt(0);
1442 }
1443
1436 } // namespace ash 1444 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/display_manager.h ('k') | ash/display/display_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698