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

Unified Diff: ash/wm/workspace/multi_window_resize_controller.cc

Issue 2905893002: chromeos: convert more ash/wm code to aura::Window (Closed)
Patch Set: moar cleanup Created 3 years, 7 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
Index: ash/wm/workspace/multi_window_resize_controller.cc
diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc
index 266d11848681650be25e04a1082f9b1f6d82f5e4..6bfdde05da4ac8f6351f696766e5b54685a2b46a 100644
--- a/ash/wm/workspace/multi_window_resize_controller.cc
+++ b/ash/wm/workspace/multi_window_resize_controller.cc
@@ -7,8 +7,8 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/wm/window_state.h"
+#include "ash/wm/window_util.h"
#include "ash/wm/workspace/workspace_window_resizer.h"
-#include "ash/wm_window.h"
#include "ui/aura/window.h"
#include "ui/aura/window_delegate.h"
#include "ui/base/cursor/cursor.h"
@@ -276,10 +276,7 @@ MultiWindowResizeController::DetermineWindowsFromScreenPoint(
gfx::Point mouse_location(
display::Screen::GetScreen()->GetCursorScreenPoint());
mouse_location = ConvertPointFromScreen(window, mouse_location);
- const int component =
- window->delegate()
- ? window->delegate()->GetNonClientComponent(mouse_location)
- : HTNOWHERE;
+ const int component = wm::GetNonClientComponent(window, mouse_location);
return DetermineWindows(window, component, mouse_location);
}
@@ -596,10 +593,7 @@ bool MultiWindowResizeController::IsOverComponent(
const gfx::Point& location_in_screen,
int component) const {
gfx::Point window_loc = ConvertPointFromScreen(window, location_in_screen);
- const int window_component =
- window->delegate() ? window->delegate()->GetNonClientComponent(window_loc)
- : HTNOWHERE;
- return window_component == component;
+ return wm::GetNonClientComponent(window, window_loc) == component;
}
} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698