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

Unified Diff: chrome/browser/gpu/gl_string_manager.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix double registration in Chrome Frame test. Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/geolocation/geolocation_prefs.cc ('k') | chrome/browser/intranet_redirect_detector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gpu/gl_string_manager.cc
diff --git a/chrome/browser/gpu/gl_string_manager.cc b/chrome/browser/gpu/gl_string_manager.cc
index a9216f5f97286e1eaaf3fc3571db932a368014fd..1f2382d4afbf19c16a7a199a469073120d0974cb 100644
--- a/chrome/browser/gpu/gl_string_manager.cc
+++ b/chrome/browser/gpu/gl_string_manager.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/gpu/gl_string_manager.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/common/pref_names.h"
#include "content/public/browser/gpu_data_manager.h"
@@ -21,14 +22,16 @@ void GLStringManager::Initialize() {
// We never remove this observer from GpuDataManager.
content::GpuDataManager::GetInstance()->AddObserver(this);
- PrefServiceSimple* local_state = g_browser_process->local_state();
+ PrefService* local_state = g_browser_process->local_state();
if (!local_state)
return;
// TODO(joi): This should happen via browser_prefs::RegisterLocalState().
- local_state->RegisterStringPref(prefs::kGLVendorString, gl_vendor_);
- local_state->RegisterStringPref(prefs::kGLRendererString, gl_renderer_);
- local_state->RegisterStringPref(prefs::kGLVersionString, gl_version_);
+ PrefRegistrySimple* registry = static_cast<PrefRegistrySimple*>(
+ local_state->DeprecatedGetPrefRegistry());
+ registry->RegisterStringPref(prefs::kGLVendorString, gl_vendor_);
+ registry->RegisterStringPref(prefs::kGLRendererString, gl_renderer_);
+ registry->RegisterStringPref(prefs::kGLVersionString, gl_version_);
gl_vendor_ = local_state->GetString(prefs::kGLVendorString);
gl_renderer_ = local_state->GetString(prefs::kGLRendererString);
« no previous file with comments | « chrome/browser/geolocation/geolocation_prefs.cc ('k') | chrome/browser/intranet_redirect_detector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698