ui: Move compositor/ directory out of gfx/, up to ui/.

ash/magnifier/magnification_controller.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/magnifier/magnification_controller.h"
 
 #include "ash/shell.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_property.h"
-#include "ui/gfx/compositor/layer.h"
-#include "ui/gfx/compositor/scoped_layer_animation_settings.h"
+#include "ui/compositor/layer.h"
+#include "ui/compositor/scoped_layer_animation_settings.h"
 
 namespace {
 
 const float kMaximumMagnifiScale = 4.0f;
 const float kMaximumMagnifiScaleThreshold = 4.0f;
 const float kMinimumMagnifiScale = 1.0f;
 const float kMinimumMagnifiScaleThreshold = 1.1f;
 
 }  // namespace
 
@@ skipping 97 matching lines @@
 gfx::Rect MagnificationController::GetWindowRect() {
   gfx::Size size = root_window_->GetHostSize();
   int width = size.width() / scale_;
   int height = size.height() / scale_;
 
   return gfx::Rect(x_, y_, width, height);
 }
 
 }  // namespace internal
 }  // namespace ash