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

ui/compositor/layer_animation_observer.h

 // 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.
 
-#ifndef UI_GFX_COMPOSITOR_LAYER_ANIMATION_OBSERVER_H_
-#define UI_GFX_COMPOSITOR_LAYER_ANIMATION_OBSERVER_H_
+#ifndef UI_COMPOSITOR_LAYER_ANIMATION_OBSERVER_H_
+#define UI_COMPOSITOR_LAYER_ANIMATION_OBSERVER_H_
 #pragma once
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "ui/gfx/compositor/compositor_export.h"
+#include "ui/compositor/compositor_export.h"
 
 namespace ui {
 
 class LayerAnimationSequence;
 class ScopedLayerAnimationSettings;
 class ImplicitAnimationObserver;
 
 // LayerAnimationObservers are notified when animations complete.
 class COMPOSITOR_EXPORT LayerAnimationObserver  {
  public:
@@ skipping 85 matching lines @@
   bool active() const { return active_; }
   void SetActive(bool active);
 
   void CheckCompleted();
 
   bool active_;
 };
 
 }  // namespace ui
 
-#endif  // UI_GFX_COMPOSITOR_LAYER_ANIMATION_OBSERVER_H_
+#endif  // UI_COMPOSITOR_LAYER_ANIMATION_OBSERVER_H_