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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/gpu/gl_string_manager.h" 5 #include "chrome/browser/gpu/gl_string_manager.h"
6 6
7 #include "chrome/browser/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/prefs/pref_registry_simple.h"
8 #include "chrome/browser/prefs/pref_service.h" 9 #include "chrome/browser/prefs/pref_service.h"
9 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
10 #include "content/public/browser/gpu_data_manager.h" 11 #include "content/public/browser/gpu_data_manager.h"
11 12
12 GLStringManager::GLStringManager() { 13 GLStringManager::GLStringManager() {
13 } 14 }
14 15
15 GLStringManager::~GLStringManager() { 16 GLStringManager::~GLStringManager() {
16 } 17 }
17 18
18 void GLStringManager::Initialize() { 19 void GLStringManager::Initialize() {
19 // On MacOSX or Windows, preliminary GPUInfo is enough. 20 // On MacOSX or Windows, preliminary GPUInfo is enough.
20 #if defined(OS_LINUX) 21 #if defined(OS_LINUX)
21 // We never remove this observer from GpuDataManager. 22 // We never remove this observer from GpuDataManager.
22 content::GpuDataManager::GetInstance()->AddObserver(this); 23 content::GpuDataManager::GetInstance()->AddObserver(this);
23 24
24 PrefServiceSimple* local_state = g_browser_process->local_state(); 25 PrefService* local_state = g_browser_process->local_state();
25 if (!local_state) 26 if (!local_state)
26 return; 27 return;
27 28
28 // TODO(joi): This should happen via browser_prefs::RegisterLocalState(). 29 // TODO(joi): This should happen via browser_prefs::RegisterLocalState().
29 local_state->RegisterStringPref(prefs::kGLVendorString, gl_vendor_); 30 PrefRegistrySimple* registry = static_cast<PrefRegistrySimple*>(
30 local_state->RegisterStringPref(prefs::kGLRendererString, gl_renderer_); 31 local_state->DeprecatedGetPrefRegistry());
31 local_state->RegisterStringPref(prefs::kGLVersionString, gl_version_); 32 registry->RegisterStringPref(prefs::kGLVendorString, gl_vendor_);
33 registry->RegisterStringPref(prefs::kGLRendererString, gl_renderer_);
34 registry->RegisterStringPref(prefs::kGLVersionString, gl_version_);
32 35
33 gl_vendor_ = local_state->GetString(prefs::kGLVendorString); 36 gl_vendor_ = local_state->GetString(prefs::kGLVendorString);
34 gl_renderer_ = local_state->GetString(prefs::kGLRendererString); 37 gl_renderer_ = local_state->GetString(prefs::kGLRendererString);
35 gl_version_ = local_state->GetString(prefs::kGLVersionString); 38 gl_version_ = local_state->GetString(prefs::kGLVersionString);
36 39
37 if (!gl_vendor_.empty() || !gl_renderer_.empty() || !gl_version_.empty()) { 40 if (!gl_vendor_.empty() || !gl_renderer_.empty() || !gl_version_.empty()) {
38 content::GpuDataManager::GetInstance()->SetGLStrings( 41 content::GpuDataManager::GetInstance()->SetGLStrings(
39 gl_vendor_, gl_renderer_, gl_version_); 42 gl_vendor_, gl_renderer_, gl_version_);
40 } 43 }
41 #endif 44 #endif
(...skipping 15 matching lines...) Expand all
57 if (!gl_renderer.empty() && gl_renderer != gl_renderer_) { 60 if (!gl_renderer.empty() && gl_renderer != gl_renderer_) {
58 gl_renderer_ = gl_renderer; 61 gl_renderer_ = gl_renderer;
59 local_state->SetString(prefs::kGLRendererString, gl_renderer_); 62 local_state->SetString(prefs::kGLRendererString, gl_renderer_);
60 } 63 }
61 if (!gl_version.empty() && gl_version != gl_version_) { 64 if (!gl_version.empty() && gl_version != gl_version_) {
62 gl_version_ = gl_version; 65 gl_version_ = gl_version;
63 local_state->SetString(prefs::kGLVersionString, gl_version_); 66 local_state->SetString(prefs::kGLVersionString, gl_version_);
64 } 67 }
65 } 68 }
66 69
OLDNEW
« 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