Refactor: Shelf Widget

ash/wm/gestures/shelf_gesture_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/shelf_gesture_handler.h"
 
 #include "ash/root_window_controller.h"
-#include "ash/shelf_types.h"
+#include "ash/shelf/shelf_layout_manager.h"
+#include "ash/shelf/shelf_types.h"
+#include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/wm/gestures/tray_gesture_handler.h"
-#include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // A ShelfResetHandler auto-hides the shelf as soon as the user interacts with
@@ skipping 14 matching lines @@
     shelf_->RemoveObserver(this);
   }
 
   void ResetShelfState() {
     shelf_->SetAutoHideBehavior(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
     delete this;
   }
 
   bool ShelfIsEventTarget(const ui::Event& event) {
     aura::Window* target = static_cast<aura::Window*>(event.target());
-    views::Widget* widget = shelf_->launcher_widget();
+    views::Widget* widget = shelf_->shelf_widget();
     if (widget && widget->GetNativeWindow() == target)
       return true;
-    widget = shelf_->status_area_widget();
+    widget = shelf_->shelf_widget()->status_area_widget();
     if (widget && widget->GetNativeWindow() == target)
       return true;
     return false;
   }
 
   void DecideShelfVisibility(const gfx::Point& location) {
     // For the rest of the mouse events, ignore if the event happens inside the
     // shelf.
-    views::Widget* widget = shelf_->launcher_widget();
+    views::Widget* widget = shelf_->shelf_widget();
     if (widget &&
         widget->GetWindowBoundsInScreen().Contains(location)) {
       return;
     }
 
-    widget = shelf_->status_area_widget();
+    widget = shelf_->shelf_widget()->status_area_widget();
     if (widget &&
         widget->GetWindowBoundsInScreen().Contains(location)) {
       return;
     }
 
     ResetShelfState();
   }
 
   // Overridden from ui::EventHandler:
   virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
@@ skipping 48 matching lines @@
     // The gestures are disabled in the lock/login screen.
     return false;
   }
 
   // The gesture are disabled for fullscreen windows.
   aura::Window* active = wm::GetActiveWindow();
   if (active && wm::IsWindowFullscreen(active))
     return false;
 
   // TODO(oshima): Find the root window controller from event's location.
-  ShelfLayoutManager* shelf = Shell::GetPrimaryRootWindowController()->shelf();
+  ShelfLayoutManager* shelf =
+      Shell::GetPrimaryRootWindowController()->shelf_layout_manager();
   if (event.type() == ui::ET_GESTURE_SCROLL_BEGIN) {
     drag_in_progress_ = true;
     shelf->StartGestureDrag(event);
     return true;
   }
 
   if (!drag_in_progress_)
     return false;
 
   if (event.type() == ui::ET_GESTURE_SCROLL_UPDATE) {
@@ skipping 25 matching lines @@
     return true;
   }
 
   // Unexpected event. Reset the state and let the event fall through.
   shelf->CancelGestureDrag();
   return false;
 }
 
 }  // namespace internal
 }  // namespace ash