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

content/common/gpu/gpu_channel.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 CONTENT_COMMON_GPU_GPU_CHANNEL_H_
 #define CONTENT_COMMON_GPU_GPU_CHANNEL_H_
 #pragma once
 
 #include <deque>
 #include <string>
 
 #include "base/id_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process.h"
 #include "build/build_config.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/gpu/gpu_memory_manager.h"
 #include "content/common/message_router.h"
 #include "ipc/ipc_sync_channel.h"
-#include "ui/gfx/gl/gl_share_group.h"
-#include "ui/gfx/gl/gpu_preference.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/gl_share_group.h"
+#include "ui/gl/gpu_preference.h"
 
 class GpuChannelManager;
 struct GPUCreateCommandBufferConfig;
 class GpuWatchdog;
 
 namespace base {
 class MessageLoopProxy;
 class WaitableEvent;
 }
 
@@ skipping 134 matching lines @@
   bool handle_messages_scheduled_;
   bool processed_get_state_fast_;
   int32 num_contexts_preferring_discrete_gpu_;
 
   base::WeakPtrFactory<GpuChannel> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChannel);
 };
 
 #endif  // CONTENT_COMMON_GPU_GPU_CHANNEL_H_