summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs
diff options
context:
space:
mode:
authorzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-12 22:32:21 +0000
committerzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-12 22:32:21 +0000
commite6933d2a81b22e3e61c8b151d190e1c367045e9c (patch)
tree8a9aac8157c2e3412d5fa23740d69a4c3ebd5efc /chrome/browser/prefs
parentc1eb412c36dfde221b8a7f50b965b59b5194efe1 (diff)
downloadchromium_src-e6933d2a81b22e3e61c8b151d190e1c367045e9c.zip
chromium_src-e6933d2a81b22e3e61c8b151d190e1c367045e9c.tar.gz
chromium_src-e6933d2a81b22e3e61c8b151d190e1c367045e9c.tar.bz2
Add a user pref in Settings to disable all GPU features.
BUG=173130 TEST=about:settings Review URL: https://codereview.chromium.org/12593005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187666 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
-rw-r--r--chrome/browser/prefs/browser_prefs.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index af263c6..b3f9f2b 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -32,6 +32,7 @@
#include "chrome/browser/google/google_url_tracker.h"
#include "chrome/browser/google/google_url_tracker_factory.h"
#include "chrome/browser/gpu/gl_string_manager.h"
+#include "chrome/browser/gpu/gpu_mode_manager.h"
#include "chrome/browser/instant/search.h"
#include "chrome/browser/intranet_redirect_detector.h"
#include "chrome/browser/io_thread.h"
@@ -183,6 +184,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
FlagsUI::RegisterPrefs(registry);
geolocation::RegisterPrefs(registry);
GLStringManager::RegisterPrefs(registry);
+ GpuModeManager::RegisterPrefs(registry);
IntranetRedirectDetector::RegisterPrefs(registry);
IOThread::RegisterPrefs(registry);
KeywordEditorController::RegisterPrefs(registry);