Move GetRootWindowController() to root_window_controller.h

ash/wm/gestures/long_press_affordance_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/long_press_affordance_handler.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/shell.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell_window_ids.h"
-#include "ash/wm/property_util.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/gestures/gesture_configuration.h"
 #include "ui/base/gestures/gesture_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
+namespace ash {
+namespace internal {
 namespace {
 
 const int kAffordanceOuterRadius = 60;
 const int kAffordanceInnerRadius = 50;
 
 // Angles from x-axis at which the outer and inner circles start.
 const int kAffordanceOuterStartAngle = -109;
 const int kAffordanceInnerStartAngle = -65;
 
 const int kAffordanceGlowWidth = 20;
@@ skipping 23 matching lines @@
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS;
   params.keep_on_top = true;
   params.accept_events = false;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.context = root_window;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   widget->Init(params);
   widget->SetOpacity(0xFF);
-  ash::GetRootWindowController(root_window)->GetContainer(
-      ash::internal::kShellWindowId_OverlayContainer)->AddChild(
-          widget->GetNativeWindow());
+  GetRootWindowController(root_window)->GetContainer(
+      kShellWindowId_OverlayContainer)->AddChild(widget->GetNativeWindow());
   return widget;
 }
 
 void PaintAffordanceArc(gfx::Canvas* canvas,
                         gfx::Point& center,
                         int radius,
                         int start_angle,
                         int end_angle) {
   SkPaint paint;
   paint.setStyle(SkPaint::kStroke_Style);
@@ skipping 41 matching lines @@
   arc_path.addArc(SkRect::MakeXYWH(center.x() - radius,
                                    center.y() - radius,
                                    2 * radius,
                                    2 * radius),
                   0, 360);
   canvas->DrawPath(arc_path, paint);
 }
 
 }  // namespace
 
-namespace ash {
-namespace internal {
-
 // View of the LongPressAffordanceHandler. Draws the actual contents and
 // updates as the animation proceeds. It also maintains the views::Widget that
 // the animation is shown in.
 class LongPressAffordanceHandler::LongPressAffordanceView
     : public views::View {
  public:
   LongPressAffordanceView(const gfx::Point& event_location,
                           aura::RootWindow* root_window)
       : views::View(),
         widget_(CreateAffordanceWidget(root_window)),
@@ skipping 141 matching lines @@
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LongPressAffordanceHandler, private
 
 void LongPressAffordanceHandler::StartAnimation() {
   aura::RootWindow* root_window = NULL;
   switch (current_animation_type_) {
     case GROW_ANIMATION:
-      root_window = ash::Shell::GetInstance()->display_controller()->
+      root_window = Shell::GetInstance()->display_controller()->
           GetRootWindowForDisplayId(tap_down_display_id_);
       if (!root_window) {
         StopAnimation();
         return;
       }
       view_.reset(new LongPressAffordanceView(tap_down_location_, root_window));
       SetDuration(
           ui::GestureConfiguration::long_press_time_in_seconds() * 1000 -
           ui::GestureConfiguration::semi_long_press_time_in_seconds() * 1000 -
           kAffordanceDelayBeforeShrinkMs);
@@ skipping 57 matching lines @@
     default:
       view_.reset();
       tap_down_touch_id_ = -1;
       tap_down_display_id_ = 0;
       break;
   }
 }
 
 }  // namespace internal
 }  // namespace ash