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

Unified Diff: ash/wm/panel_window_resizer.cc

Issue 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: formatting and moved a couple unit tests Created 7 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
Index: ash/wm/panel_window_resizer.cc
diff --git a/ash/wm/panel_window_resizer.cc b/ash/wm/panel_window_resizer.cc
index fee35a5c52b3d5fe26de9a6e1f0485f7a7f7141a..35d49f22d7efc099e82fd25128c4535451e9c69d 100644
--- a/ash/wm/panel_window_resizer.cc
+++ b/ash/wm/panel_window_resizer.cc
@@ -6,6 +6,7 @@
#include "ash/launcher/launcher.h"
#include "ash/root_window_controller.h"
+#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
#include "ash/wm/cursor_manager.h"
@@ -102,8 +103,8 @@ PanelWindowResizer::PanelWindowResizer(const Details& details)
bool PanelWindowResizer::AttachToLauncher(gfx::Rect* bounds) {
bool should_attach = false;
if (panel_layout_manager_) {
- int launcher_top = panel_layout_manager_->launcher()->widget()->
- GetWindowBoundsInScreen().y();
+ int launcher_top = panel_layout_manager_->launcher()->
+ shelf_widget()->GetWindowBoundsInScreen().y();
if (bounds->y() >= (launcher_top - bounds->height() -
kPanelSnapToLauncherDistance)) {
should_attach = true;

Powered by Google App Engine
This is Rietveld 408576698