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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/gestures/system_pinch_handler.cc

Issue 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 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
« ash/shelf/shelf_widget_unittest.cc ('K') | « ash/wm/gestures/shelf_gesture_handler.cc ('k') | ash/wm/maximize_bubble_controller.cc » ('j') | ash/wm/panel_layout_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/gestures/system_pinch_handler.cc
diff --git a/ash/wm/gestures/system_pinch_handler.cc b/ash/wm/gestures/system_pinch_handler.cc
index 806f4f96b8b4696f0f2bf4fb5269614ebb50538c..39a733beffc65779164a72a0b1d3660c32146da0 100644
--- a/ash/wm/gestures/system_pinch_handler.cc
+++ b/ash/wm/gestures/system_pinch_handler.cc
@@ -6,6 +6,7 @@
#include "ash/launcher/launcher.h"
#include "ash/screen_ash.h"
+#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
#include "ash/wm/property_util.h"
#include "ash/wm/window_util.h"
@@ -131,7 +132,7 @@ gfx::Rect SystemPinchHandler::GetPhantomWindowScreenBounds(
Launcher* launcher = Launcher::ForWindow(window);
gfx::Rect rect = launcher->GetScreenBoundsOfItemIconForWindow(target_);
if (rect.IsEmpty())
- rect = launcher->widget()->GetWindowBoundsInScreen();
+ rect = launcher->shelf_widget()->GetWindowBoundsInScreen();
else
rect.Inset(-8, -8);
phantom_state_ = PHANTOM_WINDOW_MINIMIZED;
« ash/shelf/shelf_widget_unittest.cc ('K') | « ash/wm/gestures/shelf_gesture_handler.cc ('k') | ash/wm/maximize_bubble_controller.cc » ('j') | ash/wm/panel_layout_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698