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

Side by Side Diff: chrome/browser/ui/webui/plugins_ui.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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/ui/webui/plugins_ui.h" 5 #include "chrome/browser/ui/webui/plugins_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 } 484 }
485 485
486 // static 486 // static
487 base::RefCountedMemory* PluginsUI::GetFaviconResourceBytes( 487 base::RefCountedMemory* PluginsUI::GetFaviconResourceBytes(
488 ui::ScaleFactor scale_factor) { 488 ui::ScaleFactor scale_factor) {
489 return ResourceBundle::GetSharedInstance(). 489 return ResourceBundle::GetSharedInstance().
490 LoadDataResourceBytesForScale(IDR_PLUGINS_FAVICON, scale_factor); 490 LoadDataResourceBytesForScale(IDR_PLUGINS_FAVICON, scale_factor);
491 } 491 }
492 492
493 // static 493 // static
494 void PluginsUI::RegisterUserPrefs(PrefService* prefs) { 494 void PluginsUI::RegisterUserPrefs(PrefServiceSyncable* prefs) {
495 prefs->RegisterBooleanPref(prefs::kPluginsShowDetails, 495 prefs->RegisterBooleanPref(prefs::kPluginsShowDetails,
496 false, 496 false,
497 PrefService::UNSYNCABLE_PREF); 497 PrefServiceSyncable::UNSYNCABLE_PREF);
498 prefs->RegisterDictionaryPref(prefs::kContentSettingsPluginWhitelist, 498 prefs->RegisterDictionaryPref(prefs::kContentSettingsPluginWhitelist,
499 PrefService::SYNCABLE_PREF); 499 PrefServiceSyncable::SYNCABLE_PREF);
500 } 500 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/plugins_ui.h ('k') | chrome/browser/ui/webui/print_preview/sticky_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698