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

Side by Side Diff: chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again; base::File changes conflicted. 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/extensions/extension_settings_handler.h" 5 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/base64.h" 8 #include "base/base64.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 14 matching lines...) Expand all
25 #include "chrome/browser/extensions/extension_service.h" 25 #include "chrome/browser/extensions/extension_service.h"
26 #include "chrome/browser/extensions/extension_system.h" 26 #include "chrome/browser/extensions/extension_system.h"
27 #include "chrome/browser/extensions/extension_warning_set.h" 27 #include "chrome/browser/extensions/extension_warning_set.h"
28 #include "chrome/browser/extensions/lazy_background_task_queue.h" 28 #include "chrome/browser/extensions/lazy_background_task_queue.h"
29 #include "chrome/browser/extensions/management_policy.h" 29 #include "chrome/browser/extensions/management_policy.h"
30 #include "chrome/browser/extensions/shell_window_registry.h" 30 #include "chrome/browser/extensions/shell_window_registry.h"
31 #include "chrome/browser/extensions/unpacked_installer.h" 31 #include "chrome/browser/extensions/unpacked_installer.h"
32 #include "chrome/browser/extensions/updater/extension_updater.h" 32 #include "chrome/browser/extensions/updater/extension_updater.h"
33 #include "chrome/browser/google/google_util.h" 33 #include "chrome/browser/google/google_util.h"
34 #include "chrome/browser/managed_mode/managed_mode.h" 34 #include "chrome/browser/managed_mode/managed_mode.h"
35 #include "chrome/browser/prefs/pref_registry_syncable.h"
35 #include "chrome/browser/prefs/pref_service.h" 36 #include "chrome/browser/prefs/pref_service.h"
36 #include "chrome/browser/profiles/profile.h" 37 #include "chrome/browser/profiles/profile.h"
37 #include "chrome/browser/tab_contents/background_contents.h" 38 #include "chrome/browser/tab_contents/background_contents.h"
38 #include "chrome/browser/ui/browser_finder.h" 39 #include "chrome/browser/ui/browser_finder.h"
39 #include "chrome/browser/ui/chrome_select_file_policy.h" 40 #include "chrome/browser/ui/chrome_select_file_policy.h"
40 #include "chrome/browser/ui/extensions/application_launch.h" 41 #include "chrome/browser/ui/extensions/application_launch.h"
41 #include "chrome/browser/ui/extensions/shell_window.h" 42 #include "chrome/browser/ui/extensions/shell_window.h"
42 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 43 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
43 #include "chrome/browser/view_type_utils.h" 44 #include "chrome/browser/view_type_utils.h"
44 #include "chrome/common/chrome_notification_types.h" 45 #include "chrome/common/chrome_notification_types.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 ManagementPolicy* policy) 104 ManagementPolicy* policy)
104 : extension_service_(service), 105 : extension_service_(service),
105 management_policy_(policy), 106 management_policy_(policy),
106 ignore_notifications_(false), 107 ignore_notifications_(false),
107 deleting_rvh_(NULL), 108 deleting_rvh_(NULL),
108 registered_for_notifications_(false), 109 registered_for_notifications_(false),
109 ALLOW_THIS_IN_INITIALIZER_LIST(warning_service_observer_(this)) { 110 ALLOW_THIS_IN_INITIALIZER_LIST(warning_service_observer_(this)) {
110 } 111 }
111 112
112 // static 113 // static
113 void ExtensionSettingsHandler::RegisterUserPrefs(PrefServiceSyncable* prefs) { 114 void ExtensionSettingsHandler::RegisterUserPrefs(
114 prefs->RegisterBooleanPref(prefs::kExtensionsUIDeveloperMode, 115 PrefRegistrySyncable* registry) {
115 false, 116 registry->RegisterBooleanPref(prefs::kExtensionsUIDeveloperMode,
116 PrefServiceSyncable::SYNCABLE_PREF); 117 false,
118 PrefRegistrySyncable::SYNCABLE_PREF);
117 } 119 }
118 120
119 DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue( 121 DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
120 const Extension* extension, 122 const Extension* extension,
121 const std::vector<ExtensionPage>& pages, 123 const std::vector<ExtensionPage>& pages,
122 const extensions::ExtensionWarningService* warning_service) { 124 const extensions::ExtensionWarningService* warning_service) {
123 DictionaryValue* extension_data = new DictionaryValue(); 125 DictionaryValue* extension_data = new DictionaryValue();
124 bool enabled = extension_service_->IsExtensionEnabled(extension->id()); 126 bool enabled = extension_service_->IsExtensionEnabled(extension->id());
125 extension->GetBasicInfo(enabled, extension_data); 127 extension->GetBasicInfo(enabled, extension_data);
126 128
(...skipping 906 matching lines...) Expand 10 before | Expand all | Expand 10 after
1033 std::vector<std::string> requirement_errors) { 1035 std::vector<std::string> requirement_errors) {
1034 if (requirement_errors.empty()) { 1036 if (requirement_errors.empty()) {
1035 extension_service_->EnableExtension(extension_id); 1037 extension_service_->EnableExtension(extension_id);
1036 } else { 1038 } else {
1037 ExtensionErrorReporter::GetInstance()->ReportError( 1039 ExtensionErrorReporter::GetInstance()->ReportError(
1038 UTF8ToUTF16(JoinString(requirement_errors, ' ')), 1040 UTF8ToUTF16(JoinString(requirement_errors, ' ')),
1039 true /* be noisy */); 1041 true /* be noisy */);
1040 } 1042 }
1041 requirements_checker_.reset(); 1043 requirements_checker_.reset();
1042 } 1044 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/extensions/extension_settings_handler.h ('k') | chrome/browser/ui/webui/instant_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698