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

Side by Side Diff: ash/shell.cc

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4
Patch Set: and another rebase Created 4 years, 10 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/shelf/shelf_widget_unittest.cc ('k') | ash/test/display_manager_test_api.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/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 aura::Window* Shell::GetTargetRootWindow() { 236 aura::Window* Shell::GetTargetRootWindow() {
237 CHECK(HasInstance()); 237 CHECK(HasInstance());
238 Shell* shell = GetInstance(); 238 Shell* shell = GetInstance();
239 if (shell->scoped_target_root_window_) 239 if (shell->scoped_target_root_window_)
240 return shell->scoped_target_root_window_; 240 return shell->scoped_target_root_window_;
241 return shell->target_root_window_; 241 return shell->target_root_window_;
242 } 242 }
243 243
244 // static 244 // static
245 gfx::Screen* Shell::GetScreen() { 245 gfx::Screen* Shell::GetScreen() {
246 return gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_ALTERNATE); 246 return gfx::Screen::GetScreen();
247 } 247 }
248 248
249 // static 249 // static
250 aura::Window::Windows Shell::GetAllRootWindows() { 250 aura::Window::Windows Shell::GetAllRootWindows() {
251 CHECK(HasInstance()); 251 CHECK(HasInstance());
252 return Shell::GetInstance()->window_tree_host_manager()->GetAllRootWindows(); 252 return Shell::GetInstance()->window_tree_host_manager()->GetAllRootWindows();
253 } 253 }
254 254
255 // static 255 // static
256 aura::Window* Shell::GetContainer(aura::Window* root_window, 256 aura::Window* Shell::GetContainer(aura::Window* root_window,
(...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after
1170 1170
1171 void Shell::OnWindowActivated( 1171 void Shell::OnWindowActivated(
1172 aura::client::ActivationChangeObserver::ActivationReason reason, 1172 aura::client::ActivationChangeObserver::ActivationReason reason,
1173 aura::Window* gained_active, 1173 aura::Window* gained_active,
1174 aura::Window* lost_active) { 1174 aura::Window* lost_active) {
1175 if (gained_active) 1175 if (gained_active)
1176 target_root_window_ = gained_active->GetRootWindow(); 1176 target_root_window_ = gained_active->GetRootWindow();
1177 } 1177 }
1178 1178
1179 } // namespace ash 1179 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_widget_unittest.cc ('k') | ash/test/display_manager_test_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698