Installing extensions (drag/drop, download crx file) will now be...

chrome/browser/download/download_manager.cc

 // Copyright (c) 2006-2008 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/download/download_manager.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/task.h"
 #include "base/thread.h"
 #include "base/timer.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_file.h"
 #include "chrome/browser/extensions/extension.h"
+#include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
@@ skipping 652 matching lines @@
     NOTREACHED();  // Should not exist!
     return;
   }
 
   // Called before DownloadFinished in order to avoid a race condition where we
   // attempt to open a completed download before it has been renamed.
   file_loop_->PostTask(FROM_HERE,
       NewRunnableMethod(file_manager_,
                         &DownloadFileManager::OnFinalDownloadName,
                         download->id(),
-                        target_path));
+                        target_path,
+                        this));
 
   // If the download already completed by the time we reached this point, then
   // notify observers that it did.
   PendingFinishedMap::iterator pending_it =
       pending_finished_downloads_.find(info->download_id);
   if (pending_it != pending_finished_downloads_.end())
     DownloadFinished(pending_it->first, pending_it->second);
 
   download->Rename(target_path);
 
@@ skipping 106 matching lines @@
     file_loop_->PostTask(FROM_HERE,
         NewRunnableMethod(
             this, &DownloadManager::ProceedWithFinishedDangerousDownload,
             download->db_handle(),
             download->full_path(), download->original_name()));
     return;
   }
   ContinueDownloadFinished(download);
 }
 
+void DownloadManager::DownloadRenamedToFinalName(int download_id,
+                                                 const FilePath& full_path) {
+  FilePath::StringType extension = full_path.Extension();
+  // Drop the leading period.
+  if (extension.size() > 0)
+    extension = extension.substr(1);
+
+  if (extension == chrome::kExtensionFileExtension) {
+    OpenChromeExtension(full_path);
+  }
+}
+
 void DownloadManager::ContinueDownloadFinished(DownloadItem* download) {
   // If this was a dangerous download, it has now been approved and must be
   // removed from dangerous_finished_ so it does not get deleted on shutdown.
   DownloadMap::iterator it = dangerous_finished_.find(download->id());
   if (it != dangerous_finished_.end())
     dangerous_finished_.erase(it);
 
   // Notify our observers that we are complete (the call to Finished() set the
   // state to complete but did not notify).
   download->UpdateObservers();
 
   // Open the download if the user or user prefs indicate it should be.
   FilePath::StringType extension = download->full_path().Extension();
   // Drop the leading period.
   if (extension.size() > 0)
     extension = extension.substr(1);
+
+  // Handle chrome extensions explicitly and skip the shell execute.
+  if (extension == chrome::kExtensionFileExtension) {
+    // Skip the shell execute. This will be handled in
+    // DownloadRenamedToFinalName
+    return;
+  }
+
   if (download->open_when_complete() || ShouldOpenFileExtension(extension))
     OpenDownloadInShell(download, NULL);
 }
 
 // Called on the file thread.  Renames the downloaded file to its original name.
 void DownloadManager::ProceedWithFinishedDangerousDownload(
     int64 download_handle,
     const FilePath& path,
     const FilePath& original_name) {
   bool success = false;
@@ skipping 339 matching lines @@
 // Post Windows Shell operations to the Download thread, to avoid blocking the
 // user interface.
 void DownloadManager::ShowDownloadInShell(const DownloadItem* download) {
   DCHECK(file_manager_);
   file_loop_->PostTask(FROM_HERE,
       NewRunnableMethod(file_manager_,
                         &DownloadFileManager::OnShowDownloadInShell,
                         FilePath(download->full_path())));
 }
 
+void DownloadManager::OpenDownload(const DownloadItem* download,
+                                   gfx::NativeView parent_window) {
+  FilePath::StringType extension = download->full_path().Extension();
+  // Drop the leading period.
+  if (extension.size() > 0)
+    extension = extension.substr(1);
+
+  // Open Chrome extensions with ExtenstionsService. For everthing else do shell
+  // execute.
+  if (extension == chrome::kExtensionFileExtension) {
+    OpenChromeExtension(download->full_path());
+  } else {
+    OpenDownloadInShell(download, parent_window);
+  }
+}
+
+void DownloadManager::OpenChromeExtension(const FilePath& full_path) {
+  ExtensionsService* extensions_service = profile_->GetExtensionsService();
+  extensions_service->InstallExtension(full_path);
+}
+
 void DownloadManager::OpenDownloadInShell(const DownloadItem* download,
                                           gfx::NativeView parent_window) {
   DCHECK(file_manager_);
   file_loop_->PostTask(FROM_HERE,
       NewRunnableMethod(file_manager_,
                         &DownloadFileManager::OnOpenDownloadInShell,
                         download->full_path(), download->url(), parent_window));
 }
 
 void DownloadManager::OpenFilesOfExtension(
@@ skipping 241 matching lines @@
       searched_downloads.push_back(dit->second);
   }
 
   requestor->SetDownloads(searched_downloads);
 }
 
 // Clears the last download path, used to initialize "save as" dialogs.
 void DownloadManager::ClearLastDownloadPath() {
   last_download_path_ = FilePath();
 }