Add Mac interface for installing bundles of extensions.

chrome/browser/extensions/bundle_installer.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/extensions/bundle_installer.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
+#include "base/i18n/rtl.h"
+#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_install_dialog.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 51 matching lines @@
     0,
     IDS_EXTENSION_BUNDLE_INSTALL_PROMPT_HEADING_EXTENSIONS,
     IDS_EXTENSION_BUNDLE_INSTALL_PROMPT_HEADING_APPS,
     IDS_EXTENSION_BUNDLE_INSTALL_PROMPT_HEADING_EXTENSION_APPS
   },
   {
     0,
     IDS_EXTENSION_BUNDLE_INSTALLED_HEADING_EXTENSIONS,
     IDS_EXTENSION_BUNDLE_INSTALLED_HEADING_APPS,
     IDS_EXTENSION_BUNDLE_INSTALLED_HEADING_EXTENSION_APPS
-  },
-  { IDS_EXTENSION_BUNDLE_ERROR_HEADING, 0, 0, 0 }
+  }
 };
 
 }  // namespace
 
 // static
 void BundleInstaller::SetAutoApproveForTesting(bool auto_approve) {
   CHECK(CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType));
   g_auto_approve_for_test = auto_approve ? PROCEED : ABORT;
 }
 
 BundleInstaller::Item::Item() : state(STATE_PENDING) {}
 
+string16 BundleInstaller::Item::GetNameForDisplay() {
+  string16 name = UTF8ToUTF16(localized_name);
+  base::i18n::AdjustStringForLocaleDirection(&name);
+  return l10n_util::GetStringFUTF16(IDS_EXTENSION_PERMISSION_LINE, name);
+}
+
 BundleInstaller::BundleInstaller(Profile* profile,
                                  const BundleInstaller::ItemList& items)
     : approved_(false),
       browser_(NULL),
       profile_(profile),
       delegate_(NULL) {
   BrowserList::AddObserver(this);
   for (size_t i = 0; i < items.size(); ++i) {
     items_[items[i].id] = items[i];
     items_[items[i].id].state = Item::STATE_PENDING;
@@ skipping 48 matching lines @@
         profile_,
         this,
         controller,
         i->first,
         WebstoreInstaller::FLAG_NONE);
     installer->Start();
   }
 }
 
 string16 BundleInstaller::GetHeadingTextFor(Item::State state) const {
-  size_t total = 0;
-  size_t apps = 0;
+  if (state == Item::STATE_FAILED) {
+    if (GetItemsWithState(state).size())
+      return l10n_util::GetStringUTF16(IDS_EXTENSION_BUNDLE_ERROR_HEADING);
+    return string16();
+  }
 
-  // For STATE_FAILED, we can't tell if the items were apps or extensions
-  // so we always show the same message.

[Yoyo Zhou, 2012/02/28 00:42:39]

Why remove this comment?

[jstritar, 2012/03/05 18:05:08]

Re-added.

-  if (state == Item::STATE_INSTALLED || state == Item::STATE_PENDING) {
-    total = GetItemsWithState(state).size();
-    apps = std::count_if(
-        dummy_extensions_.begin(), dummy_extensions_.end(), &IsAppPredicate);
-  }
+  size_t total = GetItemsWithState(state).size();
+  size_t apps = std::count_if(
+      dummy_extensions_.begin(), dummy_extensions_.end(), &IsAppPredicate);
 
   bool has_apps = apps > 0;
   bool has_extensions = apps < total;
   size_t index = (has_extensions << 0) + (has_apps << 1);
 
   CHECK_LT(static_cast<size_t>(state), arraysize(kHeadingIds));
   CHECK_LT(index, arraysize(kHeadingIds[state]));
 
   int msg_id = kHeadingIds[state][index];
   if (!msg_id)
     return string16();
 
   return l10n_util::GetStringUTF16(msg_id);
 }
 
-#if !defined(TOOLKIT_GTK)
+#if defined(TOOLKIT_VIEWS)

[Yoyo Zhou, 2012/02/28 00:42:39]

I trust you know what to do with the merge conflict between your 2 CLs here.

[jstritar, 2012/03/05 18:05:08]

The other CL landed, so I removed this entire block.

 // static
 void BundleInstaller::ShowInstalledBubble(
     const BundleInstaller* bundle, Browser* browser) {
   // TODO(jstritar): provide platform specific implementations.
 }
 #endif
 
 void BundleInstaller::ParseManifests() {
   if (items_.empty()) {
     ReportCanceled(false);
@@ skipping 121 matching lines @@
 void BundleInstaller::OnExtensionInstallSuccess(const std::string& id) {
   items_[id].state = Item::STATE_INSTALLED;
 
   ShowInstalledBubbleIfDone();
 }
 
 void BundleInstaller::OnExtensionInstallFailure(const std::string& id,
                                                 const std::string& error) {
   items_[id].state = Item::STATE_FAILED;
 
-  std::remove_if(dummy_extensions_.begin(), dummy_extensions_.end(),
-                 MatchIdFunctor(id));
+  ExtensionList::iterator i = std::find_if(
+      dummy_extensions_.begin(), dummy_extensions_.end(), MatchIdFunctor(id));
+  CHECK(dummy_extensions_.end() != i);
+  dummy_extensions_.erase(i);
 
   ShowInstalledBubbleIfDone();
 }
 
 void BundleInstaller::OnBrowserAdded(const Browser* browser) {
 }
 
 void BundleInstaller::OnBrowserRemoved(const Browser* browser) {
   if (browser_ == browser)
     browser_ = NULL;
 }
 
 void BundleInstaller::OnBrowserSetLastActive(const Browser* browser) {
 }
 
 }  // namespace extensions