From 681958c2886d27a7ef9649cfb2ff355e0922cbfe Mon Sep 17 00:00:00 2001 From: "joi@chromium.org" Date: Thu, 21 Feb 2013 13:48:14 +0000 Subject: First batch of fixing pref registrations. TBR=ben@chromium.org,gman@chromium.org,pfeldman@chromium.org BUG=155525 Review URL: https://codereview.chromium.org/12263040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183798 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/gpu/gl_string_manager.cc | 14 +++++++------- chrome/browser/gpu/gl_string_manager.h | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'chrome/browser/gpu') diff --git a/chrome/browser/gpu/gl_string_manager.cc b/chrome/browser/gpu/gl_string_manager.cc index 6e7091b..f678ecb 100644 --- a/chrome/browser/gpu/gl_string_manager.cc +++ b/chrome/browser/gpu/gl_string_manager.cc @@ -10,6 +10,13 @@ #include "chrome/common/pref_names.h" #include "content/public/browser/gpu_data_manager.h" +// static +void GLStringManager::RegisterPrefs(PrefRegistrySimple* registry) { + registry->RegisterStringPref(prefs::kGLVendorString, std::string()); + registry->RegisterStringPref(prefs::kGLRendererString, std::string()); + registry->RegisterStringPref(prefs::kGLVersionString, std::string()); +} + GLStringManager::GLStringManager() { } @@ -26,13 +33,6 @@ void GLStringManager::Initialize() { if (!local_state) return; - // TODO(joi): This should happen via browser_prefs::RegisterLocalState(). - PrefRegistrySimple* registry = static_cast( - 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); gl_version_ = local_state->GetString(prefs::kGLVersionString); diff --git a/chrome/browser/gpu/gl_string_manager.h b/chrome/browser/gpu/gl_string_manager.h index bf3b499..25e0f5a 100644 --- a/chrome/browser/gpu/gl_string_manager.h +++ b/chrome/browser/gpu/gl_string_manager.h @@ -10,8 +10,12 @@ #include "base/compiler_specific.h" #include "content/public/browser/gpu_data_manager_observer.h" +class PrefRegistrySimple; + class GLStringManager : public content::GpuDataManagerObserver { public: + static void RegisterPrefs(PrefRegistrySimple* registry); + GLStringManager(); virtual ~GLStringManager(); -- cgit v1.1