Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Side by Side Diff: content/browser/gpu/gpu_data_manager.cc

Issue 8336007: Move content_client.h into content/public. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add back a needed include. Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/gpu/gpu_data_manager.h" 5 #include "content/browser/gpu/gpu_data_manager.h"
6 6
7 #if defined(OS_MACOSX) 7 #if defined(OS_MACOSX)
8 #include <CoreGraphics/CGDisplayConfiguration.h> 8 #include <CoreGraphics/CGDisplayConfiguration.h>
9 #endif 9 #endif
10 10
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
13 #include "base/stringprintf.h" 13 #include "base/stringprintf.h"
14 #include "base/string_number_conversions.h" 14 #include "base/string_number_conversions.h"
15 #include "base/sys_info.h" 15 #include "base/sys_info.h"
16 #include "base/values.h" 16 #include "base/values.h"
17 #include "base/version.h" 17 #include "base/version.h"
18 #include "content/browser/browser_thread.h" 18 #include "content/browser/browser_thread.h"
19 #include "content/browser/gpu/gpu_blacklist.h" 19 #include "content/browser/gpu/gpu_blacklist.h"
20 #include "content/browser/gpu/gpu_process_host.h" 20 #include "content/browser/gpu/gpu_process_host.h"
21 #include "content/common/content_client.h"
22 #include "content/common/gpu/gpu_messages.h" 21 #include "content/common/gpu/gpu_messages.h"
23 #include "content/gpu/gpu_info_collector.h" 22 #include "content/gpu/gpu_info_collector.h"
23 #include "content/public/common/content_client.h"
24 #include "content/public/common/content_switches.h" 24 #include "content/public/common/content_switches.h"
25 #include "ui/gfx/gl/gl_implementation.h" 25 #include "ui/gfx/gl/gl_implementation.h"
26 #include "ui/gfx/gl/gl_switches.h" 26 #include "ui/gfx/gl/gl_switches.h"
27 #include "webkit/plugins/plugin_switches.h" 27 #include "webkit/plugins/plugin_switches.h"
28 28
29 namespace { 29 namespace {
30 30
31 enum GpuFeatureStatus { 31 enum GpuFeatureStatus {
32 kGpuFeatureEnabled = 0, 32 kGpuFeatureEnabled = 0,
33 kGpuFeatureBlacklisted = 1, 33 kGpuFeatureBlacklisted = 1,
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 if (gpu_blacklist_.get() != NULL && gpu_blacklist_->max_entry_id() == 0) 691 if (gpu_blacklist_.get() != NULL && gpu_blacklist_->max_entry_id() == 0)
692 return NULL; 692 return NULL;
693 return gpu_blacklist_.get(); 693 return gpu_blacklist_.get();
694 } 694 }
695 695
696 bool GpuDataManager::UseGLIsOSMesaOrAny() { 696 bool GpuDataManager::UseGLIsOSMesaOrAny() {
697 return (user_flags_.use_gl() == "any" || 697 return (user_flags_.use_gl() == "any" ||
698 user_flags_.use_gl() == gfx::kGLImplementationOSMesaName); 698 user_flags_.use_gl() == gfx::kGLImplementationOSMesaName);
699 } 699 }
700 700
OLDNEW
« no previous file with comments | « content/browser/geolocation/arbitrator_dependency_factory.cc ('k') | content/browser/renderer_host/render_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698