Add ErrorConsole UI for Extension Install Warnings

chrome/browser/ui/webui/extensions/extension_settings_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
 
 #include "apps/app_load_service.h"
 #include "apps/app_restore_service.h"
 #include "apps/saved_files_service.h"
 #include "apps/shell_window.h"
@@ skipping 10 matching lines @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/crx_installer.h"
+#include "chrome/browser/extensions/error_console/error_console.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_disabled_ui.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/extension_warning_set.h"
 #include "chrome/browser/extensions/lazy_background_task_queue.h"
 #include "chrome/browser/extensions/management_policy.h"
@@ skipping 25 matching lines @@
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
+#include "extensions/browser/extension_error.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/constants.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
-
+using base::DictionaryValue;
+using base::ListValue;
 using content::RenderViewHost;
 using content::WebContents;
 
 namespace extensions {
 
 ExtensionPage::ExtensionPage(const GURL& url,
                              int render_process_id,
                              int render_view_id,
                              bool incognito,
                              bool generated_background_page)
@@ skipping 150 matching lines @@
     if (!warnings.empty()) {
       base::ListValue* warnings_list = new base::ListValue;
       for (std::vector<std::string>::const_iterator iter = warnings.begin();
            iter != warnings.end(); ++iter) {
         warnings_list->Append(base::Value::CreateStringValue(*iter));
       }
       extension_data->Set("warnings", warnings_list);
     }
   }
 
-  // Add install warnings (these are not the same as warnings!).
-  if (Manifest::IsUnpackedLocation(extension->location())) {
+  // If the ErrorConsole is enabled, get the errors for the extension and add
+  // them to the list. Otherwise, use the install warnings (using both is
+  // redundant).
+  ErrorConsole* error_console =
+      ErrorConsole::Get(extension_service_->profile());
+  if (error_console->enabled()) {
+    const ErrorConsole::ErrorList& errors =
+        error_console->GetErrorsForExtension(extension->id());
+    if (!errors.empty()) {
+      scoped_ptr<ListValue> list(new ListValue);
+      for (ErrorConsole::ErrorList::const_iterator iter = errors.begin();
+           iter != errors.end(); ++iter) {
+        list->Append((*iter)->ToValue().release());
+      }
+      extension_data->Set("manifestErrors", list.release());
+    }
+  } else if (Manifest::IsUnpackedLocation(extension->location())) {
     const std::vector<InstallWarning>& install_warnings =
         extension->install_warnings();
     if (!install_warnings.empty()) {
       scoped_ptr<base::ListValue> list(new base::ListValue());
       for (std::vector<InstallWarning>::const_iterator it =
                install_warnings.begin(); it != install_warnings.end(); ++it) {
         base::DictionaryValue* item = new base::DictionaryValue();
         item->SetString("message", it->message);
         list->Append(item);
       }
@@ skipping 865 matching lines @@
     extension_service_->EnableExtension(extension_id);
   } else {
     ExtensionErrorReporter::GetInstance()->ReportError(
         UTF8ToUTF16(JoinString(requirement_errors, ' ')),
         true /* be noisy */);
   }
   requirements_checker_.reset();
 }
 
 }  // namespace extensions