OLD | NEW |
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 Loading... |
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(user_prefs::PrefRegistrySyncable* registry) { | 494 void PluginsUI::RegisterProfilePrefs( |
| 495 user_prefs::PrefRegistrySyncable* registry) { |
495 registry->RegisterBooleanPref( | 496 registry->RegisterBooleanPref( |
496 prefs::kPluginsShowDetails, | 497 prefs::kPluginsShowDetails, |
497 false, | 498 false, |
498 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 499 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
499 registry->RegisterDictionaryPref( | 500 registry->RegisterDictionaryPref( |
500 prefs::kContentSettingsPluginWhitelist, | 501 prefs::kContentSettingsPluginWhitelist, |
501 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 502 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
502 } | 503 } |
OLD | NEW |