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

content/browser/gpu/gpu_data_manager_impl.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 "content/browser/gpu/gpu_data_manager_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/stringprintf.h"
 #include "base/sys_info.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/gpu/gpu_info_collector.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_switches.h"
 #include "webkit/plugins/plugin_switches.h"
 
 using content::BrowserThread;
 using content::GpuDataManagerObserver;
 using content::GpuFeatureType;
 
 // static
 content::GpuDataManager* content::GpuDataManager::GetInstance() {
   return GpuDataManagerImpl::GetInstance();
 }
@@ skipping 252 matching lines @@
     int flags = gpu_feature_type_;
     flags |= content::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING |
              content::GPU_FEATURE_TYPE_WEBGL;
     gpu_feature_type_ = static_cast<GpuFeatureType>(flags);
   }
 
   EnableSoftwareRenderingIfNecessary();
   NotifyGpuInfoUpdate();
 }