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

Side by Side Diff: ash/mus/bridge/wm_root_window_controller_mus.cc

Issue 2295003002: mash: Remove WmRootWindowControllerObserver. (Closed)
Patch Set: Address comments. 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
« no previous file with comments | « ash/mus/bridge/wm_root_window_controller_mus.h ('k') | ui/display/display_observer.h » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/mus/bridge/wm_root_window_controller_mus.h" 5 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
6 6
7 #include "ash/common/wm_root_window_controller_observer.h"
8 #include "ash/mus/bridge/wm_shelf_mus.h" 7 #include "ash/mus/bridge/wm_shelf_mus.h"
9 #include "ash/mus/bridge/wm_shell_mus.h" 8 #include "ash/mus/bridge/wm_shell_mus.h"
10 #include "ash/mus/bridge/wm_window_mus.h" 9 #include "ash/mus/bridge/wm_window_mus.h"
11 #include "ash/mus/container_ids.h" 10 #include "ash/mus/container_ids.h"
12 #include "ash/mus/root_window_controller.h" 11 #include "ash/mus/root_window_controller.h"
13 #include "ash/mus/window_manager.h" 12 #include "ash/mus/window_manager.h"
14 #include "services/ui/public/cpp/window.h" 13 #include "services/ui/public/cpp/window.h"
15 #include "services/ui/public/cpp/window_property.h" 14 #include "services/ui/public/cpp/window_property.h"
16 #include "services/ui/public/cpp/window_tree_client.h" 15 #include "services/ui/public/cpp/window_tree_client.h"
17 #include "ui/display/display.h" 16 #include "ui/display/display.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 gfx::Point location = root_window_controller_->window_manager() 122 gfx::Point location = root_window_controller_->window_manager()
124 ->window_tree_client() 123 ->window_tree_client()
125 ->GetCursorScreenPoint(); 124 ->GetCursorScreenPoint();
126 location -= 125 location -=
127 root_window_controller_->display().bounds().origin().OffsetFromOrigin(); 126 root_window_controller_->display().bounds().origin().OffsetFromOrigin();
128 return location; 127 return location;
129 } 128 }
130 129
131 } // namespace mus 130 } // namespace mus
132 } // namespace ash 131 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_root_window_controller_mus.h ('k') | ui/display/display_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698