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

Side by Side Diff: chrome/browser/web_resource/gpu_blacklist_updater.cc

Issue 7108035: Revert 88400 (Probable breaker of XP Tests(dbg)(5), 10.6 Tests (dbg)(2), 10.5 Tests (dbg)(2)) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 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
« no previous file with comments | « no previous file | chrome/browser/web_resource/promo_resource_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/web_resource/gpu_blacklist_updater.h" 5 #include "chrome/browser/web_resource/gpu_blacklist_updater.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/prefs/pref_service.h" 10 #include "chrome/browser/prefs/pref_service.h"
(...skipping 21 matching lines...) Expand all
32 chrome::VersionInfo version_info; 32 chrome::VersionInfo version_info;
33 return version_info.is_valid() ? version_info.Version() : "0"; 33 return version_info.is_valid() ? version_info.Version() : "0";
34 } 34 }
35 35
36 } // namespace anonymous 36 } // namespace anonymous
37 37
38 const char* GpuBlacklistUpdater::kDefaultGpuBlacklistURL = 38 const char* GpuBlacklistUpdater::kDefaultGpuBlacklistURL =
39 "https://dl.google.com/dl/edgedl/chrome/gpu/software_rendering_list.json"; 39 "https://dl.google.com/dl/edgedl/chrome/gpu/software_rendering_list.json";
40 40
41 GpuBlacklistUpdater::GpuBlacklistUpdater() 41 GpuBlacklistUpdater::GpuBlacklistUpdater()
42 : WebResourceService(g_browser_process->local_state(), 42 : WebResourceService(ProfileManager::GetDefaultProfile(),
43 g_browser_process->local_state(),
43 GpuBlacklistUpdater::kDefaultGpuBlacklistURL, 44 GpuBlacklistUpdater::kDefaultGpuBlacklistURL,
44 false, // don't append locale to URL 45 false, // don't append locale to URL
45 NotificationType::NOTIFICATION_TYPE_COUNT, 46 NotificationType::NOTIFICATION_TYPE_COUNT,
46 prefs::kGpuBlacklistUpdate, 47 prefs::kGpuBlacklistUpdate,
47 kStartGpuBlacklistFetchDelay, 48 kStartGpuBlacklistFetchDelay,
48 kCacheUpdateDelay) { 49 kCacheUpdateDelay) {
49 prefs_->RegisterDictionaryPref(prefs::kGpuBlacklist); 50 prefs_->RegisterDictionaryPref(prefs::kGpuBlacklist);
50 InitializeGpuBlacklist(); 51 InitializeGpuBlacklist();
51 } 52 }
52 53
(...skipping 29 matching lines...) Expand all
82 const DictionaryValue& gpu_blacklist_cache, bool preliminary) { 83 const DictionaryValue& gpu_blacklist_cache, bool preliminary) {
83 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 84 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
84 85
85 scoped_ptr<GpuBlacklist> gpu_blacklist( 86 scoped_ptr<GpuBlacklist> gpu_blacklist(
86 new GpuBlacklist(GetChromeVersionString())); 87 new GpuBlacklist(GetChromeVersionString()));
87 if (gpu_blacklist->LoadGpuBlacklist(gpu_blacklist_cache, true)) { 88 if (gpu_blacklist->LoadGpuBlacklist(gpu_blacklist_cache, true)) {
88 GpuDataManager::GetInstance()->UpdateGpuBlacklist( 89 GpuDataManager::GetInstance()->UpdateGpuBlacklist(
89 gpu_blacklist.release(), preliminary); 90 gpu_blacklist.release(), preliminary);
90 } 91 }
91 } 92 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/web_resource/promo_resource_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698