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

Unified Diff: ash/wm/panels/attached_panel_window_targeter.cc

Issue 1929023002: Refactors WindowResizers to use ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/panels/attached_panel_window_targeter.cc
diff --git a/ash/wm/panels/attached_panel_window_targeter.cc b/ash/wm/panels/attached_panel_window_targeter.cc
index cb3c67ff99d76acbd38bb92c08fa8dca7429fb98..9ccc0d9235278d201fbc97936e6bdfc1997c865d 100644
--- a/ash/wm/panels/attached_panel_window_targeter.cc
+++ b/ash/wm/panels/attached_panel_window_targeter.cc
@@ -6,6 +6,7 @@
#include "ash/shelf/shelf.h"
#include "ash/shell.h"
+#include "ash/wm/aura/wm_shelf_aura.h"
#include "ash/wm/panels/panel_layout_manager.h"
namespace ash {
@@ -50,10 +51,12 @@ void AttachedPanelWindowTargeter::UpdateTouchExtend(aura::Window* root_window) {
DCHECK(panel_layout_manager_->shelf());
gfx::Insets touch(default_touch_extend_);
- set_touch_extend(panel_layout_manager_->shelf()->SelectValueForShelfAlignment(
- gfx::Insets(touch.top(), touch.left(), 0, touch.right()),
- gfx::Insets(touch.top(), 0, touch.bottom(), touch.right()),
- gfx::Insets(touch.top(), touch.left(), touch.bottom(), 0)));
+ set_touch_extend(
+ wm::WmShelfAura::GetShelf(panel_layout_manager_->shelf())
+ ->SelectValueForShelfAlignment(
+ gfx::Insets(touch.top(), touch.left(), 0, touch.right()),
+ gfx::Insets(touch.top(), 0, touch.bottom(), touch.right()),
+ gfx::Insets(touch.top(), touch.left(), touch.bottom(), 0)));
}
} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698