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

Side by Side Diff: services/ui/ws/user_display_manager.cc

Issue 2549503002: Rename PlatformScreen to ScreenManager. (Closed)
Patch Set: Rebase. 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
« no previous file with comments | « services/ui/ws/test_utils.cc ('k') | services/ui/ws/user_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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "services/ui/ws/user_display_manager.h" 5 #include "services/ui/ws/user_display_manager.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "services/ui/display/platform_screen.h" 9 #include "services/ui/display/screen_manager.h"
10 #include "services/ui/ws/display.h" 10 #include "services/ui/ws/display.h"
11 #include "services/ui/ws/display_manager.h" 11 #include "services/ui/ws/display_manager.h"
12 #include "services/ui/ws/user_display_manager_delegate.h" 12 #include "services/ui/ws/user_display_manager_delegate.h"
13 #include "ui/display/types/display_constants.h" 13 #include "ui/display/types/display_constants.h"
14 14
15 namespace ui { 15 namespace ui {
16 namespace ws { 16 namespace ws {
17 17
18 UserDisplayManager::UserDisplayManager(ws::DisplayManager* display_manager, 18 UserDisplayManager::UserDisplayManager(ws::DisplayManager* display_manager,
19 UserDisplayManagerDelegate* delegate, 19 UserDisplayManagerDelegate* delegate,
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 } 151 }
152 152
153 return display_ptrs; 153 return display_ptrs;
154 } 154 }
155 155
156 void UserDisplayManager::CallOnDisplays( 156 void UserDisplayManager::CallOnDisplays(
157 mojom::DisplayManagerObserver* observer) { 157 mojom::DisplayManagerObserver* observer) {
158 // TODO(kylechar): Pass internal display id to clients here. 158 // TODO(kylechar): Pass internal display id to clients here.
159 observer->OnDisplays( 159 observer->OnDisplays(
160 GetAllDisplays().PassStorage(), 160 GetAllDisplays().PassStorage(),
161 display::PlatformScreen::GetInstance()->GetPrimaryDisplayId(), 161 display::ScreenManager::GetInstance()->GetPrimaryDisplayId(),
162 display::kInvalidDisplayId); 162 display::kInvalidDisplayId);
163 } 163 }
164 164
165 } // namespace ws 165 } // namespace ws
166 } // namespace ui 166 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/test_utils.cc ('k') | services/ui/ws/user_display_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698