Allow drag-and-drop of zipped extensions on chrome://extensions

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

 // Copyright 2014 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_loader_handler.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/path_util.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
+#include "chrome/browser/extensions/zipfile_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/file_highlighter.h"
 #include "extensions/common/constants.h"
@@ skipping 184 matching lines @@
   ui_ready_ = true;
 
   // Notify the frontend of any load failures that were triggered while the
   // chrome://extensions page was loading.
   if (!failures_.empty())
     NotifyFrontendOfFailure();
 }
 
 void ExtensionLoaderHandler::LoadUnpackedExtensionImpl(
     const base::FilePath& file_path) {
-  scoped_refptr<UnpackedInstaller> installer = UnpackedInstaller::Create(
-      ExtensionSystem::Get(profile_)->extension_service());
+  if (EndsWith(file_path.AsUTF16Unsafe(),
+               base::ASCIIToUTF16(".zip"),
+               false /* case insensitive */)) {
+    scoped_refptr<ZipFileInstaller> installer = ZipFileInstaller::Create(
+        ExtensionSystem::Get(profile_)->extension_service());
 
-  // We do our own error handling, so we don't want a load failure to trigger
-  // a dialog.
-  installer->set_be_noisy_on_failure(false);
+    // We do our own error handling, so we don't want a load failure to trigger
+    // a dialog.
+    installer->set_be_noisy_on_failure(false);
 
-  installer->Load(file_path);
+    installer->LoadFromZipFile(file_path);
+  } else {
+    scoped_refptr<UnpackedInstaller> installer = UnpackedInstaller::Create(
+        ExtensionSystem::Get(profile_)->extension_service());
+
+    // We do our own error handling, so we don't want a load failure to trigger
+    // a dialog.
+    installer->set_be_noisy_on_failure(false);
+
+    installer->Load(file_path);
+  }
 }
 
 void ExtensionLoaderHandler::OnLoadFailure(
     content::BrowserContext* browser_context,
     const base::FilePath& file_path,
     const std::string& error) {
   // Only show errors from our browser context.
   if (web_ui()->GetWebContents()->GetBrowserContext() != browser_context)
     return;
 
@@ skipping 44 matching lines @@
 
   scoped_ptr<base::DictionaryValue> manifest_value(new base::DictionaryValue());
   SourceHighlighter highlighter(manifest, line_number);
   // If the line number is 0, this highlights no regions, but still adds the
   // full manifest.
   highlighter.SetHighlightedRegions(manifest_value.get());
 
   scoped_ptr<base::DictionaryValue> failure(new base::DictionaryValue());
   failure->Set("path",
                new base::StringValue(prettified_path.LossyDisplayName()));
-  failure->Set("error", new base::StringValue(base::UTF8ToUTF16(error)));
+  failure->Set("reason", new base::StringValue(base::UTF8ToUTF16(error)));

[Devlin, 2014/08/11 15:58:01]

This looks like a merge conflict resolution gone wrong, and I think this caused
crbug.com/402342.  Lemme know if you'll have time to push through a quick patch
(if not, I can).  Cheers! :)

   failure->Set("manifest", manifest_value.release());
   failures_.Append(failure.release());
 
   // Only notify the frontend if the frontend UI is ready.
   if (ui_ready_)
     NotifyFrontendOfFailure();
 }
 
 void ExtensionLoaderHandler::NotifyFrontendOfFailure() {
   web_ui()->CallJavascriptFunction(
       "extensions.ExtensionLoader.notifyLoadFailed",
       failures_);
   failures_.Clear();
 }
 
 }  // namespace extensions