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

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

Issue 10689097: Enforce the 'requirements' field in manifests. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 4 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
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"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/file_util.h" 12 #include "base/file_util.h"
13 #include "base/string_number_conversions.h" 13 #include "base/string_number_conversions.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "base/version.h" 16 #include "base/version.h"
17 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/debugger/devtools_window.h" 18 #include "chrome/browser/debugger/devtools_window.h"
19 #include "chrome/browser/extensions/crx_installer.h" 19 #include "chrome/browser/extensions/crx_installer.h"
20 #include "chrome/browser/extensions/extension_disabled_ui.h" 20 #include "chrome/browser/extensions/extension_disabled_ui.h"
21 #include "chrome/browser/extensions/extension_error_reporter.h"
21 #include "chrome/browser/extensions/extension_host.h" 22 #include "chrome/browser/extensions/extension_host.h"
22 #include "chrome/browser/extensions/extension_service.h" 23 #include "chrome/browser/extensions/extension_service.h"
23 #include "chrome/browser/extensions/extension_system.h" 24 #include "chrome/browser/extensions/extension_system.h"
24 #include "chrome/browser/extensions/extension_warning_set.h" 25 #include "chrome/browser/extensions/extension_warning_set.h"
25 #include "chrome/browser/extensions/lazy_background_task_queue.h" 26 #include "chrome/browser/extensions/lazy_background_task_queue.h"
26 #include "chrome/browser/extensions/unpacked_installer.h" 27 #include "chrome/browser/extensions/unpacked_installer.h"
27 #include "chrome/browser/extensions/updater/extension_updater.h" 28 #include "chrome/browser/extensions/updater/extension_updater.h"
28 #include "chrome/browser/google/google_util.h" 29 #include "chrome/browser/google/google_util.h"
29 #include "chrome/browser/managed_mode.h" 30 #include "chrome/browser/managed_mode.h"
30 #include "chrome/browser/prefs/pref_service.h" 31 #include "chrome/browser/prefs/pref_service.h"
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 ++iter) { 186 ++iter) {
186 string16 warning_string( 187 string16 warning_string(
187 ExtensionWarningSet::GetLocalizedWarning(*iter)); 188 ExtensionWarningSet::GetLocalizedWarning(*iter));
188 warnings_list->Append(Value::CreateStringValue(warning_string)); 189 warnings_list->Append(Value::CreateStringValue(warning_string));
189 } 190 }
190 extension_data->Set("warnings", warnings_list); 191 extension_data->Set("warnings", warnings_list);
191 } 192 }
192 } 193 }
193 194
194 // Add install warnings (these are not the same as warnings!). 195 // Add install warnings (these are not the same as warnings!).
195 if (extension->location() == Extension::LOAD) { 196 if (extension->location() == Extension::LOAD ||
197 extension_service_->extension_prefs()->HasUnsupportedRequirements(
Aaron Boodman 2012/08/01 03:58:54 Yeah, I don't think we want to do this. Did I say
eaugusti 2012/08/03 01:06:26 This wasn't in the doc, but I think it is the best
198 extension->id())) {
196 const Extension::InstallWarningVector& install_warnings = 199 const Extension::InstallWarningVector& install_warnings =
197 extension->install_warnings(); 200 extension->install_warnings();
198 if (!install_warnings.empty()) { 201 if (!install_warnings.empty()) {
199 scoped_ptr<ListValue> list(new ListValue()); 202 scoped_ptr<ListValue> list(new ListValue());
200 for (Extension::InstallWarningVector::const_iterator it = 203 for (Extension::InstallWarningVector::const_iterator it =
201 install_warnings.begin(); it != install_warnings.end(); ++it) { 204 install_warnings.begin(); it != install_warnings.end(); ++it) {
202 DictionaryValue* item = new DictionaryValue(); 205 DictionaryValue* item = new DictionaryValue();
203 item->SetBoolean("isHTML", 206 item->SetBoolean("isHTML",
204 it->format == Extension::InstallWarning::FORMAT_HTML); 207 it->format == Extension::InstallWarning::FORMAT_HTML);
205 item->SetString("message", it->message); 208 item->SetString("message", it->message);
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 return; 618 return;
616 } 619 }
617 620
618 if (enable_str == "true") { 621 if (enable_str == "true") {
619 extensions::ExtensionPrefs* prefs = extension_service_->extension_prefs(); 622 extensions::ExtensionPrefs* prefs = extension_service_->extension_prefs();
620 if (prefs->DidExtensionEscalatePermissions(extension_id)) { 623 if (prefs->DidExtensionEscalatePermissions(extension_id)) {
621 Browser* browser = browser::FindBrowserWithWebContents( 624 Browser* browser = browser::FindBrowserWithWebContents(
622 web_ui()->GetWebContents()); 625 web_ui()->GetWebContents());
623 extensions::ShowExtensionDisabledDialog( 626 extensions::ShowExtensionDisabledDialog(
624 extension_service_, browser, extension); 627 extension_service_, browser, extension);
628 } else if (prefs->HasUnsupportedRequirements(extension_id)) {
Aaron Boodman 2012/08/01 03:58:54 Seems like you could check the disable reason inst
eaugusti 2012/08/03 01:06:26 Done.
629 // TODO(eriq): i18n
630 ExtensionErrorReporter::GetInstance()->ReportError(
631 ASCIIToUTF16("Cannot enable, not all requirements are met."),
632 true /* be noisy */);
625 } else { 633 } else {
626 extension_service_->EnableExtension(extension_id); 634 extension_service_->EnableExtension(extension_id);
627 } 635 }
628 } else { 636 } else {
629 extension_service_->DisableExtension( 637 extension_service_->DisableExtension(
630 extension_id, Extension::DISABLE_USER_ACTION); 638 extension_id, Extension::DISABLE_USER_ACTION);
631 } 639 }
632 } 640 }
633 641
634 void ExtensionSettingsHandler::HandleEnableIncognitoMessage( 642 void ExtensionSettingsHandler::HandleEnableIncognitoMessage(
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
876 return extension_uninstall_dialog_.get(); 884 return extension_uninstall_dialog_.get();
877 #else 885 #else
878 return NULL; 886 return NULL;
879 #endif // !defined(OS_ANDROID) 887 #endif // !defined(OS_ANDROID)
880 } 888 }
881 889
882 void ExtensionSettingsHandler::InspectExtensionHost(ExtensionHost* host) { 890 void ExtensionSettingsHandler::InspectExtensionHost(ExtensionHost* host) {
883 if (host) 891 if (host)
884 DevToolsWindow::OpenDevToolsWindow(host->render_view_host()); 892 DevToolsWindow::OpenDevToolsWindow(host->render_view_host());
885 } 893 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698