Refactor: Shelf Widget

ash/wm/gestures/system_pinch_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/gestures/system_pinch_handler.h"
 
 #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"
 #include "ash/wm/workspace/snap_sizer.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event_constants.h"
 #include "ui/base/gestures/gesture_types.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/widget/widget.h"
@@ skipping 105 matching lines @@
       if (restore) {
         phantom_state_ = PHANTOM_WINDOW_MINIMIZED;
         return *restore;
       }
       return window->bounds();
     }
 
     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;
     return rect;
   }
 
   phantom_state_ = PHANTOM_WINDOW_NORMAL;
   return window->bounds();
 }
 
 }  // namespace internal
 }  // namespace ash