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

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. 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/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
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/bind_helpers.h" 12 #include "base/bind_helpers.h"
13 #include "base/memory/ref_counted_memory.h" 13 #include "base/memory/ref_counted_memory.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/singleton.h" 15 #include "base/memory/singleton.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "base/message_loop.h" 17 #include "base/message_loop.h"
18 #include "base/path_service.h" 18 #include "base/path_service.h"
19 #include "base/prefs/pref_service.h"
19 #include "base/prefs/public/pref_member.h" 20 #include "base/prefs/public/pref_member.h"
20 #include "base/utf_string_conversions.h" 21 #include "base/utf_string_conversions.h"
21 #include "base/values.h" 22 #include "base/values.h"
22 #include "chrome/browser/content_settings/host_content_settings_map.h" 23 #include "chrome/browser/content_settings/host_content_settings_map.h"
23 #include "chrome/browser/plugins/plugin_finder.h" 24 #include "chrome/browser/plugins/plugin_finder.h"
24 #include "chrome/browser/plugins/plugin_metadata.h" 25 #include "chrome/browser/plugins/plugin_metadata.h"
25 #include "chrome/browser/plugins/plugin_prefs.h" 26 #include "chrome/browser/plugins/plugin_prefs.h"
26 #include "chrome/browser/prefs/pref_registry_syncable.h" 27 #include "chrome/browser/prefs/pref_registry_syncable.h"
27 #include "chrome/browser/prefs/pref_service.h"
28 #include "chrome/browser/prefs/scoped_user_pref_update.h" 28 #include "chrome/browser/prefs/scoped_user_pref_update.h"
29 #include "chrome/browser/profiles/profile.h" 29 #include "chrome/browser/profiles/profile.h"
30 #include "chrome/browser/ui/browser.h" 30 #include "chrome/browser/ui/browser.h"
31 #include "chrome/browser/ui/browser_window.h" 31 #include "chrome/browser/ui/browser_window.h"
32 #include "chrome/common/chrome_content_client.h" 32 #include "chrome/common/chrome_content_client.h"
33 #include "chrome/common/chrome_notification_types.h" 33 #include "chrome/common/chrome_notification_types.h"
34 #include "chrome/common/chrome_paths.h" 34 #include "chrome/common/chrome_paths.h"
35 #include "chrome/common/pref_names.h" 35 #include "chrome/common/pref_names.h"
36 #include "chrome/common/url_constants.h" 36 #include "chrome/common/url_constants.h"
37 #include "content/public/browser/notification_source.h" 37 #include "content/public/browser/notification_source.h"
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 } 491 }
492 492
493 // static 493 // static
494 void PluginsUI::RegisterUserPrefs(PrefRegistrySyncable* registry) { 494 void PluginsUI::RegisterUserPrefs(PrefRegistrySyncable* registry) {
495 registry->RegisterBooleanPref(prefs::kPluginsShowDetails, 495 registry->RegisterBooleanPref(prefs::kPluginsShowDetails,
496 false, 496 false,
497 PrefRegistrySyncable::UNSYNCABLE_PREF); 497 PrefRegistrySyncable::UNSYNCABLE_PREF);
498 registry->RegisterDictionaryPref(prefs::kContentSettingsPluginWhitelist, 498 registry->RegisterDictionaryPref(prefs::kContentSettingsPluginWhitelist,
499 PrefRegistrySyncable::SYNCABLE_PREF); 499 PrefRegistrySyncable::SYNCABLE_PREF);
500 } 500 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698