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

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

Issue 16248002: Move Extension::GetBasicInfo to a static helper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
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 "apps/app_load_service.h" 7 #include "apps/app_load_service.h"
8 #include "base/auto_reset.h" 8 #include "base/auto_reset.h"
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 24 matching lines...) Expand all
35 #include "chrome/browser/extensions/updater/extension_updater.h" 35 #include "chrome/browser/extensions/updater/extension_updater.h"
36 #include "chrome/browser/google/google_util.h" 36 #include "chrome/browser/google/google_util.h"
37 #include "chrome/browser/managed_mode/managed_user_service.h" 37 #include "chrome/browser/managed_mode/managed_user_service.h"
38 #include "chrome/browser/managed_mode/managed_user_service_factory.h" 38 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
39 #include "chrome/browser/profiles/profile.h" 39 #include "chrome/browser/profiles/profile.h"
40 #include "chrome/browser/tab_contents/background_contents.h" 40 #include "chrome/browser/tab_contents/background_contents.h"
41 #include "chrome/browser/ui/browser_finder.h" 41 #include "chrome/browser/ui/browser_finder.h"
42 #include "chrome/browser/ui/chrome_select_file_policy.h" 42 #include "chrome/browser/ui/chrome_select_file_policy.h"
43 #include "chrome/browser/ui/extensions/application_launch.h" 43 #include "chrome/browser/ui/extensions/application_launch.h"
44 #include "chrome/browser/ui/extensions/shell_window.h" 44 #include "chrome/browser/ui/extensions/shell_window.h"
45 #include "chrome/browser/ui/webui/extensions/extension_basic_info.h"
45 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 46 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
46 #include "chrome/common/chrome_notification_types.h" 47 #include "chrome/common/chrome_notification_types.h"
47 #include "chrome/common/chrome_switches.h" 48 #include "chrome/common/chrome_switches.h"
48 #include "chrome/common/extensions/background_info.h" 49 #include "chrome/common/extensions/background_info.h"
49 #include "chrome/common/extensions/extension.h" 50 #include "chrome/common/extensions/extension.h"
50 #include "chrome/common/extensions/extension_constants.h" 51 #include "chrome/common/extensions/extension_constants.h"
51 #include "chrome/common/extensions/extension_icon_set.h" 52 #include "chrome/common/extensions/extension_icon_set.h"
52 #include "chrome/common/extensions/extension_set.h" 53 #include "chrome/common/extensions/extension_set.h"
53 #include "chrome/common/extensions/feature_switch.h" 54 #include "chrome/common/extensions/feature_switch.h"
54 #include "chrome/common/extensions/incognito_handler.h" 55 #include "chrome/common/extensions/incognito_handler.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 false, 130 false,
130 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 131 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
131 } 132 }
132 133
133 DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue( 134 DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
134 const Extension* extension, 135 const Extension* extension,
135 const std::vector<ExtensionPage>& pages, 136 const std::vector<ExtensionPage>& pages,
136 const extensions::ExtensionWarningService* warning_service) { 137 const extensions::ExtensionWarningService* warning_service) {
137 DictionaryValue* extension_data = new DictionaryValue(); 138 DictionaryValue* extension_data = new DictionaryValue();
138 bool enabled = extension_service_->IsExtensionEnabled(extension->id()); 139 bool enabled = extension_service_->IsExtensionEnabled(extension->id());
139 extension->GetBasicInfo(enabled, extension_data); 140 extensions::GetExtensionBasicInfo(extension, enabled, extension_data);
140 141
141 extension_data->SetBoolean( 142 extension_data->SetBoolean(
142 "userModifiable", 143 "userModifiable",
143 management_policy_->UserMayModifySettings(extension, NULL)); 144 management_policy_->UserMayModifySettings(extension, NULL));
144 145
145 GURL icon = 146 GURL icon =
146 ExtensionIconSource::GetIconURL(extension, 147 ExtensionIconSource::GetIconURL(extension,
147 extension_misc::EXTENSION_ICON_MEDIUM, 148 extension_misc::EXTENSION_ICON_MEDIUM,
148 ExtensionIconSet::MATCH_BIGGER, 149 ExtensionIconSet::MATCH_BIGGER,
149 !enabled, NULL); 150 !enabled, NULL);
(...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after
1037 std::vector<std::string> requirement_errors) { 1038 std::vector<std::string> requirement_errors) {
1038 if (requirement_errors.empty()) { 1039 if (requirement_errors.empty()) {
1039 extension_service_->EnableExtension(extension_id); 1040 extension_service_->EnableExtension(extension_id);
1040 } else { 1041 } else {
1041 ExtensionErrorReporter::GetInstance()->ReportError( 1042 ExtensionErrorReporter::GetInstance()->ReportError(
1042 UTF8ToUTF16(JoinString(requirement_errors, ' ')), 1043 UTF8ToUTF16(JoinString(requirement_errors, ' ')),
1043 true /* be noisy */); 1044 true /* be noisy */);
1044 } 1045 }
1045 requirements_checker_.reset(); 1046 requirements_checker_.reset();
1046 } 1047 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/extensions/extension_info_ui.cc ('k') | chrome/browser/ui/webui/net_internals/net_internals_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698