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

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

Issue 196573023: Remove PrepareForShutdown (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
« no previous file with comments | « ash/display/mouse_cursor_event_filter.cc ('k') | ash/root_window_controller.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/screen_ash.h" 5 #include "ash/display/screen_ash.h"
6 6
7 #include "ash/display/display_controller.h" 7 #include "ash/display/display_controller.h"
8 #include "ash/display/display_manager.h" 8 #include "ash/display/display_manager.h"
9 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/root_window_settings.h" 10 #include "ash/root_window_settings.h"
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 std::vector<gfx::Display> ScreenAsh::GetAllDisplays() const { 225 std::vector<gfx::Display> ScreenAsh::GetAllDisplays() const {
226 return GetDisplayManager()->displays(); 226 return GetDisplayManager()->displays();
227 } 227 }
228 228
229 gfx::Display ScreenAsh::GetDisplayNearestWindow(gfx::NativeView window) const { 229 gfx::Display ScreenAsh::GetDisplayNearestWindow(gfx::NativeView window) const {
230 if (!window) 230 if (!window)
231 return GetPrimaryDisplay(); 231 return GetPrimaryDisplay();
232 const aura::Window* root_window = window->GetRootWindow(); 232 const aura::Window* root_window = window->GetRootWindow();
233 if (!root_window) 233 if (!root_window)
234 return GetPrimaryDisplay(); 234 return GetPrimaryDisplay();
235 int64 id = internal::GetRootWindowSettings(root_window)->display_id; 235 const internal::RootWindowSettings* rws =
236 internal::GetRootWindowSettings(root_window);
237 if (rws->shutdown)
238 return gfx::Display(1);
239 int64 id = rws->display_id;
236 // if id is |kInvaildDisplayID|, it's being deleted. 240 // if id is |kInvaildDisplayID|, it's being deleted.
237 DCHECK(id != gfx::Display::kInvalidDisplayID); 241 DCHECK(id != gfx::Display::kInvalidDisplayID);
238 242
239 internal::DisplayManager* display_manager = GetDisplayManager(); 243 internal::DisplayManager* display_manager = GetDisplayManager();
240 // RootWindow needs Display to determine its device scale factor 244 // RootWindow needs Display to determine its device scale factor
241 // for non desktop display. 245 // for non desktop display.
242 if (display_manager->non_desktop_display().id() == id) 246 if (display_manager->non_desktop_display().id() == id)
243 return display_manager->non_desktop_display(); 247 return display_manager->non_desktop_display();
244 return display_manager->GetDisplayForId(id); 248 return display_manager->GetDisplayForId(id);
245 } 249 }
(...skipping 29 matching lines...) Expand all
275 279
276 void ScreenAsh::RemoveObserver(gfx::DisplayObserver* observer) { 280 void ScreenAsh::RemoveObserver(gfx::DisplayObserver* observer) {
277 observers_.RemoveObserver(observer); 281 observers_.RemoveObserver(observer);
278 } 282 }
279 283
280 gfx::Screen* ScreenAsh::CloneForShutdown() { 284 gfx::Screen* ScreenAsh::CloneForShutdown() {
281 return new ScreenForShutdown(this); 285 return new ScreenForShutdown(this);
282 } 286 }
283 287
284 } // namespace ash 288 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/mouse_cursor_event_filter.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698