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

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

Issue 11017079: Remove Shell::shelf()|status_area_widget()|launcher() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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/frame_maximize_button.cc
diff --git a/ash/wm/workspace/frame_maximize_button.cc b/ash/wm/workspace/frame_maximize_button.cc
index 76415d05738331cd4c6726d424ece968ed645f11..364b445a4a6222af3c83c97e9a9a5a927c1a9d41 100644
--- a/ash/wm/workspace/frame_maximize_button.cc
+++ b/ash/wm/workspace/frame_maximize_button.cc
@@ -477,7 +477,7 @@ gfx::Rect FrameMaximizeButton::ScreenBoundsForType(
window->parent(),
ScreenAsh::GetMaximizedWindowBoundsInParent(window));
case SNAP_MINIMIZE: {
- Launcher* launcher = Shell::GetInstance()->launcher();
+ Launcher* launcher = Launcher::ForWindow(window);
sky 2012/10/17 16:25:20 null check launcher.
oshima 2012/10/17 17:49:43 same q
gfx::Rect item_rect(launcher->GetScreenBoundsOfItemIconForWindow(
window));
if (!item_rect.IsEmpty()) {

Powered by Google App Engine
This is Rietveld 408576698