Refactoring ExtenionInstallUI to abstract the Browser references.

chrome/browser/extensions/webstore_inline_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/webstore_inline_installer.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/string_util.h"
@@ skipping 242 matching lines @@
   // Manifest, number of users, average rating and rating count are required.
   std::string manifest;
   if (!webstore_data->GetString(kManifestKey, &manifest) ||
       !webstore_data->GetString(kUsersKey, &localized_user_count_) ||
       !webstore_data->GetDouble(kAverageRatingKey, &average_rating_) ||
       !webstore_data->GetInteger(kRatingCountKey, &rating_count_)) {
     CompleteInstall(kInvalidWebstoreResponseError);
     return;
   }
 
-  if (average_rating_ < ExtensionInstallUI::kMinExtensionRating ||
-      average_rating_ >ExtensionInstallUI::kMaxExtensionRating) {
+  if (average_rating_ < ExtensionInstallPrompt::kMinExtensionRating ||
+      average_rating_ >ExtensionInstallPrompt::kMaxExtensionRating) {

[Yoyo Zhou, 2012/05/23 23:17:49]

nit: missing space

[Jay Civelli, 2012/05/30 20:20:35]

Done.

     CompleteInstall(kInvalidWebstoreResponseError);
     return;
   }
 
   // Localized name and description are optional.
   if ((webstore_data->HasKey(kLocalizedNameKey) &&
       !webstore_data->GetString(kLocalizedNameKey, &localized_name_)) ||
       (webstore_data->HasKey(kLocalizedDescriptionKey) &&
       !webstore_data->GetString(
           kLocalizedDescriptionKey, &localized_description_))) {
@@ skipping 62 matching lines @@
     return;
   }
 
   CHECK_EQ(id_, id);
   manifest_.reset(manifest);
   icon_ = icon;
 
   Profile* profile = Profile::FromBrowserContext(
       web_contents()->GetBrowserContext());
 
-  ExtensionInstallUI::Prompt prompt(ExtensionInstallUI::INLINE_INSTALL_PROMPT);
+  ExtensionInstallPrompt::Prompt prompt(
+      ExtensionInstallPrompt::INLINE_INSTALL_PROMPT);
   prompt.SetInlineInstallWebstoreData(localized_user_count_,
                                       average_rating_,
                                       rating_count_);
   std::string error;
-  dummy_extension_ = ExtensionInstallUI::GetLocalizedExtensionForDisplay(
+  dummy_extension_ = ExtensionInstallPrompt::GetLocalizedExtensionForDisplay(
       manifest, id_, localized_name_, localized_description_, &error);
   if (!dummy_extension_) {
     OnWebstoreParseFailure(id_, WebstoreInstallHelper::Delegate::MANIFEST_ERROR,
                            kInvalidManifestError);
     return;
   }
 
-  install_ui_.reset(new ExtensionInstallUI(profile));
+  install_ui_.reset(new ExtensionInstallPrompt(profile));
   install_ui_->ConfirmInlineInstall(this, dummy_extension_, &icon_, prompt);
   // Control flow finishes up in InstallUIProceed or InstallUIAbort.
 }
 
 void WebstoreInlineInstaller::OnWebstoreParseFailure(
     const std::string& id,
     InstallHelperResultCode result_code,
     const std::string& error_message) {
   CompleteInstall(error_message);
 }
@@ skipping 75 matching lines @@
       verified_site_pattern.Parse(verified_site_url);
   if (parse_result != URLPattern::PARSE_SUCCESS) {
     DLOG(WARNING) << "Could not parse " << verified_site_url <<
         " as URL pattern " << parse_result;
     return false;
   }
   verified_site_pattern.SetScheme("*");
 
   return verified_site_pattern.MatchesURL(requestor_url);
 }