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

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

Issue 2314853003: Move ash::DisplayManager switches to ui::display (Closed)
Patch Set: rebased again Created 4 years, 3 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
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/aura/wm_window_aura.h" 7 #include "ash/aura/wm_window_aura.h"
8 #include "ash/common/shelf/shelf_widget.h" 8 #include "ash/common/shelf/shelf_widget.h"
9 #include "ash/common/wm/root_window_finder.h" 9 #include "ash/common/wm/root_window_finder.h"
10 #include "ash/display/display_manager.h" 10 #include "ash/display/display_manager.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 // If there is no native, or the native was for shutdown, 183 // If there is no native, or the native was for shutdown,
184 // use ash's screen. 184 // use ash's screen.
185 if (!current || current == screen_for_shutdown) 185 if (!current || current == screen_for_shutdown)
186 display::Screen::SetScreenInstance(screen.get()); 186 display::Screen::SetScreenInstance(screen.get());
187 return new DisplayManager(std::move(screen)); 187 return new DisplayManager(std::move(screen));
188 } 188 }
189 189
190 // static 190 // static
191 void ScreenAsh::CreateScreenForShutdown() { 191 void ScreenAsh::CreateScreenForShutdown() {
192 delete screen_for_shutdown; 192 delete screen_for_shutdown;
193 // fix this up...
194 screen_for_shutdown = new ScreenForShutdown(display::Screen::GetScreen()); 193 screen_for_shutdown = new ScreenForShutdown(display::Screen::GetScreen());
195 display::Screen::SetScreenInstance(screen_for_shutdown); 194 display::Screen::SetScreenInstance(screen_for_shutdown);
196 } 195 }
197 196
198 } // namespace ash 197 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/mirror_window_controller_unittest.cc ('k') | ash/display/window_tree_host_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698