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

ash/shell/content_client/shell_browser_main_parts.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/shell/content_client/shell_browser_main_parts.h"
 
 #include "ash/shell/shell_delegate_impl.h"
 #include "ash/shell/window_watcher.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/common/content_switches.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_browser_context.h"
 #include "content/shell/shell_devtools_delegate.h"
 #include "content/shell/shell_switches.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_module.h"
 #include "ui/aura/client/stacking_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
-#include "ui/gfx/compositor/compositor.h"
-#include "ui/gfx/compositor/test/compositor_test_support.h"
+#include "ui/compositor/compositor.h"
+#include "ui/compositor/test/compositor_test_support.h"
+#include "ui/views/focus/accelerator_handler.h"
 #include "ui/views/test/test_views_delegate.h"
-#include "ui/views/focus/accelerator_handler.h"
 
 namespace ash {
 namespace shell {
 void InitWindowTypeLauncher();
 
 namespace {
 class ShellViewsDelegate : public views::TestViewsDelegate {
  public:
   ShellViewsDelegate() {}
   virtual ~ShellViewsDelegate() {}
@@ skipping 67 matching lines @@
 }
 
 ui::Clipboard* ShellBrowserMainParts::GetClipboard() {
   if (!clipboard_.get())
     clipboard_.reset(new ui::Clipboard());
   return clipboard_.get();
 }
 
 }  // namespace shell
 }  // namespace ash