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

Unified Diff: ash/mus/bridge/wm_root_window_controller_mus.cc

Issue 2624613002: Promotes common functions to WmRootWindowController (Closed)
Patch Set: order Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/bridge/wm_root_window_controller_mus.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_root_window_controller_mus.cc
diff --git a/ash/mus/bridge/wm_root_window_controller_mus.cc b/ash/mus/bridge/wm_root_window_controller_mus.cc
index fab87820c8e2f1c0b2a3edd97c80c94d88c5e3c8..6e6faed24c8643f5daedd9932c1da893570e4ac1 100644
--- a/ash/mus/bridge/wm_root_window_controller_mus.cc
+++ b/ash/mus/bridge/wm_root_window_controller_mus.cc
@@ -14,7 +14,6 @@
#include "ui/aura/window.h"
#include "ui/aura/window_property.h"
#include "ui/display/display.h"
-#include "ui/views/widget/widget.h"
DECLARE_WINDOW_PROPERTY_TYPE(ash::mus::WmRootWindowControllerMus*);
@@ -86,31 +85,6 @@ WmWindow* WmRootWindowControllerMus::GetWindow() {
return WmWindowMus::Get(root_window_controller_->root());
}
-void WmRootWindowControllerMus::ConfigureWidgetInitParamsForContainer(
- views::Widget* widget,
- int shell_container_id,
- views::Widget::InitParams* init_params) {
- init_params->parent = WmWindowMus::GetAuraWindow(
- WmWindowMus::Get(root_window_controller_->root())
- ->GetChildByShellWindowId(shell_container_id));
- DCHECK(init_params->parent);
-}
-
-WmWindow* WmRootWindowControllerMus::FindEventTarget(
- const gfx::Point& location_in_screen) {
- NOTIMPLEMENTED();
- return nullptr;
-}
-
-gfx::Point WmRootWindowControllerMus::GetLastMouseLocationInRoot() {
- gfx::Point location = root_window_controller_->window_manager()
- ->window_tree_client()
- ->GetCursorScreenPoint();
- location -=
- root_window_controller_->display().bounds().origin().OffsetFromOrigin();
- return location;
-}
-
bool WmRootWindowControllerMus::ShouldDestroyWindowInCloseChildWindows(
WmWindow* window) {
aura::WindowTreeClient* window_tree_client =
« no previous file with comments | « ash/mus/bridge/wm_root_window_controller_mus.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698