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

Side by Side Diff: ash/screen_util.cc

Issue 1898223002: Removes most aura dependencies from WindowResizer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_aura_from_window_state
Patch Set: nit and merge Created 4 years, 8 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/extended_desktop_unittest.cc ('k') | ash/shelf/shelf_view.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/screen_util.h" 5 #include "ash/screen_util.h"
6 6
7 #include "ash/display/display_manager.h" 7 #include "ash/display/display_manager.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/shelf/shelf_layout_manager.h" 9 #include "ash/shelf/shelf_layout_manager.h"
10 #include "ash/shelf/shelf_widget.h" 10 #include "ash/shelf/shelf_widget.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/wm/coordinate_conversion.h"
13 #include "base/logging.h" 12 #include "base/logging.h"
14 #include "ui/aura/client/screen_position_client.h" 13 #include "ui/aura/client/screen_position_client.h"
15 #include "ui/aura/window_event_dispatcher.h" 14 #include "ui/aura/window_event_dispatcher.h"
16 #include "ui/gfx/display.h" 15 #include "ui/gfx/display.h"
17 #include "ui/gfx/geometry/size_conversions.h" 16 #include "ui/gfx/geometry/size_conversions.h"
18 #include "ui/gfx/screen.h" 17 #include "ui/gfx/screen.h"
19 18
20 namespace ash { 19 namespace ash {
21 20
22 namespace { 21 namespace {
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 const gfx::Display& ScreenUtil::GetSecondaryDisplay() { 100 const gfx::Display& ScreenUtil::GetSecondaryDisplay() {
102 DisplayManager* display_manager = GetDisplayManager(); 101 DisplayManager* display_manager = GetDisplayManager();
103 CHECK_LE(2U, display_manager->GetNumDisplays()); 102 CHECK_LE(2U, display_manager->GetNumDisplays());
104 return display_manager->GetDisplayAt(0).id() == 103 return display_manager->GetDisplayAt(0).id() ==
105 gfx::Screen::GetScreen()->GetPrimaryDisplay().id() 104 gfx::Screen::GetScreen()->GetPrimaryDisplay().id()
106 ? display_manager->GetDisplayAt(1) 105 ? display_manager->GetDisplayAt(1)
107 : display_manager->GetDisplayAt(0); 106 : display_manager->GetDisplayAt(0);
108 } 107 }
109 108
110 } // namespace ash 109 } // namespace ash
OLDNEW
« no previous file with comments | « ash/extended_desktop_unittest.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698