Allow installing paid apps from the launcher search results.

Clicking on the install button for a paid app will now open the webstore
page for the app, where the user can sign in (if not signed in already)
and see the price of the app / buy it.

BUG=319024
TEST=Check installing paid and unpaid apps from the app launcher search
results.

Review URL: https://codereview.chromium.org/448543002

Cr-Commit-Position: refs/heads/master@{#289214}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289214 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/app_list/search/webstore/webstore_provider.cc

@@ -28,6 +28,7 @@ const char kKeyResults[] = "results";
 const char kKeyId[] = "id";
 const char kKeyLocalizedName[] = "localized_name";
 const char kKeyIconUrl[] = "icon_url";
+const char kKeyIsPaid[] = "is_paid";
 const char kKeyItemType[] = "item_type";
 
 const char kPlatformAppType[] = "platform_app";
@@ -152,9 +153,11 @@ scoped_ptr<ChromeSearchResult> WebstoreProvider::CreateResult(
   std::string app_id;
   std::string localized_name;
   std::string icon_url_string;
+  bool is_paid = false;
   if (!dict.GetString(kKeyId, &app_id) ||
       !dict.GetString(kKeyLocalizedName, &localized_name) ||
-      !dict.GetString(kKeyIconUrl, &icon_url_string)) {
+      !dict.GetString(kKeyIconUrl, &icon_url_string) ||
+      !dict.GetBoolean(kKeyIsPaid, &is_paid)) {
     return result.Pass();
   }
 
@@ -166,8 +169,13 @@ scoped_ptr<ChromeSearchResult> WebstoreProvider::CreateResult(
   dict.GetString(kKeyItemType, &item_type_string);
   extensions::Manifest::Type item_type = ParseItemType(item_type_string);
 
-  result.reset(new WebstoreResult(
-      profile_, app_id, localized_name, icon_url, item_type, controller_));
+  result.reset(new WebstoreResult(profile_,
+                                  app_id,
+                                  localized_name,
+                                  icon_url,
+                                  is_paid,
+                                  item_type,
+                                  controller_));
   return result.Pass();
 }
 

chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc

@@ -40,7 +40,8 @@ const char kOneResult[] = "{"
       "{"
         "\"id\": \"app1_id\","
         "\"localized_name\": \"app1 name\","
-        "\"icon_url\": \"http://host/icon\""
+        "\"icon_url\": \"http://host/icon\","
+        "\"is_paid\": false"
       "}"
     "]}";
 
@@ -51,18 +52,21 @@ const char kThreeResults[] = "{"
         "\"id\": \"app1_id\","
         "\"localized_name\": \"one\","
         "\"icon_url\": \"http://host/icon1\","
+        "\"is_paid\": true,"
         "\"item_type\": \"PLATFORM_APP\""
       "},"
       "{"
         "\"id\": \"app2_id\","
         "\"localized_name\": \"two\","
         "\"icon_url\": \"http://host/icon2\","
+        "\"is_paid\": false,"
         "\"item_type\": \"HOSTED_APP\""
       "},"
       "{"
         "\"id\": \"app3_id\","
         "\"localized_name\": \"three\","
         "\"icon_url\": \"http://host/icon3\","
+        "\"is_paid\": false,"
         "\"item_type\": \"LEGACY_PACKAGED_APP\""
       "}"
     "]}";
@@ -71,20 +75,22 @@ struct ParsedSearchResult {
   const char* id;
   const char* title;
   const char* icon_url;
+  bool is_paid;
   Manifest::Type item_type;
   size_t num_actions;
 };
 
-ParsedSearchResult kParsedOneResult[] = {
-  { "app1_id", "app1 name", "http://host/icon", Manifest::TYPE_UNKNOWN, 1 }
-};
+ParsedSearchResult kParsedOneResult[] = {{"app1_id", "app1 name",
+                                          "http://host/icon", false,
+                                          Manifest::TYPE_UNKNOWN, 1}};
 
 ParsedSearchResult kParsedThreeResults[] = {
-  { "app1_id", "one", "http://host/icon1", Manifest::TYPE_PLATFORM_APP, 2 },
-  { "app2_id", "two", "http://host/icon2", Manifest::TYPE_HOSTED_APP, 2 },
-  { "app3_id", "three", "http://host/icon3",
-    Manifest::TYPE_LEGACY_PACKAGED_APP, 1 }
-};
+    {"app1_id", "one", "http://host/icon1", true, Manifest::TYPE_PLATFORM_APP,
+     1},
+    {"app2_id", "two", "http://host/icon2", false, Manifest::TYPE_HOSTED_APP,
+     2},
+    {"app3_id", "three", "http://host/icon3", false,
+     Manifest::TYPE_LEGACY_PACKAGED_APP, 1}};
 
 }  // namespace
 
@@ -170,6 +176,7 @@ class WebstoreProviderTest : public InProcessBrowserTest {
       EXPECT_EQ(expected_results[i].id, webstore_result->app_id());
       EXPECT_EQ(expected_results[i].icon_url,
                 webstore_result->icon_url().spec());
+      EXPECT_EQ(expected_results[i].is_paid, webstore_result->is_paid());
       EXPECT_EQ(expected_results[i].item_type, webstore_result->item_type());
     }
   }

chrome/browser/ui/app_list/search/webstore/webstore_result.cc

@@ -67,12 +67,14 @@ WebstoreResult::WebstoreResult(Profile* profile,
                                const std::string& app_id,
                                const std::string& localized_name,
                                const GURL& icon_url,
+                               bool is_paid,
                                extensions::Manifest::Type item_type,
                                AppListControllerDelegate* controller)
     : profile_(profile),
       app_id_(app_id),
       localized_name_(localized_name),
       icon_url_(icon_url),
+      is_paid_(is_paid),
       item_type_(item_type),
       controller_(controller),
       install_tracker_(NULL),
@@ -117,6 +119,13 @@ void WebstoreResult::Open(int event_flags) {
 }
 
 void WebstoreResult::InvokeAction(int action_index, int event_flags) {
+  if (is_paid_) {
+    // Paid apps cannot be installed directly from the launcher. Instead, open
+    // the webstore page for the app.
+    Open(event_flags);
+    return;
+  }
+
   StartInstall(action_index == kLaunchEphemeralAppAction);
 }
 
@@ -125,6 +134,7 @@ scoped_ptr<ChromeSearchResult> WebstoreResult::Duplicate() {
                                                            app_id_,
                                                            localized_name_,
                                                            icon_url_,
+                                                           is_paid_,
                                                            item_type_,
                                                            controller_)).Pass();
 }
@@ -160,9 +170,9 @@ void WebstoreResult::UpdateActions() {
           l10n_util::GetStringUTF16(IDS_WEBSTORE_RESULT_INSTALL),
           l10n_util::GetStringUTF16(
               IDS_EXTENSION_INLINE_INSTALL_PROMPT_TITLE)));
-
-      if (item_type_ == extensions::Manifest::TYPE_PLATFORM_APP ||
-          item_type_ == extensions::Manifest::TYPE_HOSTED_APP) {
+      if ((item_type_ == extensions::Manifest::TYPE_PLATFORM_APP ||
+           item_type_ == extensions::Manifest::TYPE_HOSTED_APP) &&
+          !is_paid_) {
         actions.push_back(Action(
             l10n_util::GetStringUTF16(IDS_WEBSTORE_RESULT_LAUNCH),
             l10n_util::GetStringUTF16(IDS_WEBSTORE_RESULT_LAUNCH_APP_TOOLTIP)));

chrome/browser/ui/app_list/search/webstore/webstore_result.h

@@ -34,6 +34,7 @@ class WebstoreResult : public ChromeSearchResult,
                  const std::string& app_id,
                  const std::string& localized_name,
                  const GURL& icon_url,
+                 bool is_paid,
                  extensions::Manifest::Type item_type,
                  AppListControllerDelegate* controller);
   virtual ~WebstoreResult();
@@ -41,6 +42,7 @@ class WebstoreResult : public ChromeSearchResult,
   const std::string& app_id() const { return app_id_; }
   const GURL& icon_url() const { return icon_url_; }
   extensions::Manifest::Type item_type() const { return item_type_; }
+  bool is_paid() const { return is_paid_; }
 
   // ChromeSearchResult overides:
   virtual void Open(int event_flags) OVERRIDE;
@@ -83,6 +85,7 @@ class WebstoreResult : public ChromeSearchResult,
   const std::string app_id_;
   const std::string localized_name_;
   const GURL icon_url_;
+  const bool is_paid_;
   extensions::Manifest::Type item_type_;
 
   gfx::ImageSkia icon_;