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

Side by Side Diff: ash/screen_util.cc

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 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 | Annotate | Revision Log
« no previous file with comments | « ash/root_window_settings.cc ('k') | ash/screen_util_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 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_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/shelf/shelf_layout_manager.h" 10 #include "ash/shelf/shelf_layout_manager.h"
11 #include "ash/shelf/shelf_widget.h" 11 #include "ash/shelf/shelf_widget.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "ash/wm/coordinate_conversion.h" 13 #include "ash/wm/coordinate_conversion.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "ui/aura/client/screen_position_client.h" 15 #include "ui/aura/client/screen_position_client.h"
16 #include "ui/aura/root_window.h" 16 #include "ui/aura/window_event_dispatcher.h"
17 #include "ui/gfx/display.h" 17 #include "ui/gfx/display.h"
18 #include "ui/gfx/screen.h" 18 #include "ui/gfx/screen.h"
19 19
20 namespace ash { 20 namespace ash {
21 21
22 namespace { 22 namespace {
23 internal::DisplayManager* GetDisplayManager() { 23 internal::DisplayManager* GetDisplayManager() {
24 return Shell::GetInstance()->display_manager(); 24 return Shell::GetInstance()->display_manager();
25 } 25 }
26 } 26 }
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 Shell::GetScreen()->GetPrimaryDisplay().id() ? 78 Shell::GetScreen()->GetPrimaryDisplay().id() ?
79 display_manager->GetDisplayAt(1) : display_manager->GetDisplayAt(0); 79 display_manager->GetDisplayAt(1) : display_manager->GetDisplayAt(0);
80 } 80 }
81 81
82 // static 82 // static
83 const gfx::Display& ScreenUtil::GetDisplayForId(int64 display_id) { 83 const gfx::Display& ScreenUtil::GetDisplayForId(int64 display_id) {
84 return GetDisplayManager()->GetDisplayForId(display_id); 84 return GetDisplayManager()->GetDisplayForId(display_id);
85 } 85 }
86 86
87 } // namespace ash 87 } // namespace ash
OLDNEW
« no previous file with comments | « ash/root_window_settings.cc ('k') | ash/screen_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698