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

Unified Diff: ash/common/wm/dock/docked_window_layout_manager.cc

Issue 2660873002: Move two utility functions from ash/screen_util.h to ui/wm/core/coordinate_conversion.h (Closed)
Patch Set: rebase Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/BUILD.gn ('k') | ash/common/wm_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/dock/docked_window_layout_manager.cc
diff --git a/ash/common/wm/dock/docked_window_layout_manager.cc b/ash/common/wm/dock/docked_window_layout_manager.cc
index 3148ab7e8507e9366448f7d0bccae0aacb092068..3e620c3f0950099521b0aa483c9e5045aeddac23 100644
--- a/ash/common/wm/dock/docked_window_layout_manager.cc
+++ b/ash/common/wm/dock/docked_window_layout_manager.cc
@@ -21,7 +21,6 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/root_window_controller.h"
-#include "ash/screen_util.h"
#include "ash/wm/window_state_aura.h"
#include "base/auto_reset.h"
#include "base/metrics/histogram_macros.h"
@@ -31,6 +30,7 @@
#include "ui/display/display.h"
#include "ui/display/screen.h"
#include "ui/views/background.h"
+#include "ui/wm/core/coordinate_conversion.h"
#include "ui/wm/core/window_animations.h"
namespace ash {
@@ -333,8 +333,8 @@ class DockedWindowLayoutManager::ShelfWindowObserver
void OnWindowBoundsChanged(aura::Window* window,
const gfx::Rect& old_bounds,
const gfx::Rect& new_bounds) override {
- shelf_bounds_in_screen_ =
- ScreenUtil::ConvertRectToScreen(window->parent(), new_bounds);
+ shelf_bounds_in_screen_ = new_bounds;
+ ::wm::ConvertRectToScreen(window->parent(), &shelf_bounds_in_screen_);
// When the shelf is auto-hidden, it has an invisible height of 3px used
// as a hit region which is specific to Chrome OS MD (for non-MD, the 3
« no previous file with comments | « ash/BUILD.gn ('k') | ash/common/wm_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698