Add "Request app banner" context menu in DevTools

chrome/browser/banners/app_banner_data_fetcher.cc

 // Copyright 2015 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/banners/app_banner_data_fetcher.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 53 matching lines @@
 // static
 base::Time AppBannerDataFetcher::GetCurrentTime() {
   return base::Time::Now() + gTimeDeltaForTesting;
 }
 
 // static
 void AppBannerDataFetcher::SetTimeDeltaForTesting(int days) {
   gTimeDeltaForTesting = base::TimeDelta::FromDays(days);
 }
 
-AppBannerDataFetcher::AppBannerDataFetcher(
-    content::WebContents* web_contents,
-    base::WeakPtr<Delegate> delegate,
-    int ideal_icon_size_in_dp,
-    int minimum_icon_size_in_dp)
+AppBannerDataFetcher::AppBannerDataFetcher(content::WebContents* web_contents,
+                                           base::WeakPtr<Delegate> delegate,
+                                           int ideal_icon_size_in_dp,
+                                           int minimum_icon_size_in_dp,
+                                           bool is_debug_mode)
     : WebContentsObserver(web_contents),
       weak_delegate_(delegate),
       ideal_icon_size_in_dp_(ideal_icon_size_in_dp),
       minimum_icon_size_in_dp_(minimum_icon_size_in_dp),
       is_active_(false),
       was_canceled_by_page_(false),
       page_requested_prompt_(false),
+      is_debug_mode_(is_debug_mode),

[dominickn, 2016/01/18 23:20:41]

Change this to:

is_debug_mode_(is_debug_mode ||
base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kBypassAppBannerEngagementChecks)

[horo, 2016/01/19 01:45:43]

Done.

       event_request_id_(-1) {
   DCHECK(minimum_icon_size_in_dp <= ideal_icon_size_in_dp);
 }
 
 void AppBannerDataFetcher::Start(const GURL& validated_url,
                                  ui::PageTransition transition_type) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   content::WebContents* web_contents = GetWebContents();
   DCHECK(web_contents);
@@ skipping 81 matching lines @@
   // The redisplay request may be received before the Cancel prompt reply
   // *after* if it is made before the beforeinstallprompt event handler
   // concludes (e.g. in the event handler itself), so allow the pipeline
   // to continue in this case.
   //
   // Stash the referrer for the case where the banner is redisplayed.
   if (reply == blink::WebAppBannerPromptReply::Cancel &&
       !page_requested_prompt_) {
     was_canceled_by_page_ = true;
     referrer_ = referrer;
-    OutputDeveloperNotShownMessage(web_contents, kRendererRequestCancel);
+    OutputDeveloperNotShownMessage(web_contents, kRendererRequestCancel,
+                                   is_debug_mode_);
     return;
   }
 
   AppBannerSettingsHelper::RecordMinutesFromFirstVisitToShow(
       web_contents, validated_url_, GetAppIdentifier(), GetCurrentTime());
 
   // Definitely going to show the banner now.
   FOR_EACH_OBSERVER(Observer, observer_list_,
                     OnDecidedWhetherToShow(this, true));
 
@@ skipping 45 matching lines @@
   rappor::SampleDomainAndRegistryFromGURL(g_browser_process->rappor_service(),
                                           event_name,
                                           web_contents->GetURL());
 }
 
 void AppBannerDataFetcher::OnDidHasManifest(bool has_manifest) {
   content::WebContents* web_contents = GetWebContents();
 
   if (!CheckFetcherIsStillAlive(web_contents) || !has_manifest) {
     if (!has_manifest)
-      OutputDeveloperNotShownMessage(web_contents, kNoManifest);
+      OutputDeveloperNotShownMessage(web_contents, kNoManifest, is_debug_mode_);
 
     Cancel();
     return;
   }
 
   web_contents->GetManifest(
       base::Bind(&AppBannerDataFetcher::OnDidGetManifest, this));
 }
 
 void AppBannerDataFetcher::OnDidGetManifest(
     const content::Manifest& manifest) {
   content::WebContents* web_contents = GetWebContents();
   if (!CheckFetcherIsStillAlive(web_contents)) {
     Cancel();
     return;
   }
   if (manifest.IsEmpty()) {
-    OutputDeveloperNotShownMessage(web_contents, kManifestEmpty);
+    OutputDeveloperNotShownMessage(web_contents, kManifestEmpty,
+                                   is_debug_mode_);
     Cancel();
     return;
   }
 
   if (manifest.prefer_related_applications &&
       manifest.related_applications.size()) {
     for (const auto& application : manifest.related_applications) {
       std::string platform = base::UTF16ToUTF8(application.platform.string());
       std::string id = base::UTF16ToUTF8(application.id.string());
-      if (weak_delegate_->HandleNonWebApp(platform, application.url, id))
+      if (weak_delegate_->HandleNonWebApp(platform, application.url, id,
+                                          is_debug_mode_))
         return;
     }
   }
 
-  if (!IsManifestValidForWebApp(manifest, web_contents)) {
+  if (!IsManifestValidForWebApp(manifest, web_contents, is_debug_mode_)) {
     Cancel();
     return;
   }
 
   web_app_data_ = manifest;
   app_title_ = web_app_data_.name.string();
 
   if (IsWebAppInstalled(web_contents->GetBrowserContext(),
                         manifest.start_url) &&
       !base::CommandLine::ForCurrentProcess()->HasSwitch(

[dominickn, 2016/01/18 23:20:41]

Replace:

!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kBypassAppBannerEngagementChecks)

with:

!is_debug_mode_

Otherwise, developers who have already installed the webapp on desktop will get
the already installed error when they request the app banner and haven't enabled
the bypass switch. We'll put the command line check in the constructor of
is_debug_mode_.

[horo, 2016/01/19 01:45:43]

Done.

           switches::kBypassAppBannerEngagementChecks)) {
-    OutputDeveloperNotShownMessage(web_contents, kBannerAlreadyAdded);
+    OutputDeveloperNotShownMessage(web_contents, kBannerAlreadyAdded,
+                                   is_debug_mode_);
     Cancel();
     return;
   }
 
   banners::TrackDisplayEvent(DISPLAY_EVENT_WEB_APP_BANNER_REQUESTED);
 
   // Check to see if there is a single service worker controlling this page
   // and the manifest's start url.
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
@@ skipping 11 matching lines @@
 void AppBannerDataFetcher::OnDidCheckHasServiceWorker(
     bool has_service_worker) {
   content::WebContents* web_contents = GetWebContents();
   if (!CheckFetcherIsStillAlive(web_contents)) {
     Cancel();
     return;
   }
 
   if (!has_service_worker) {
     TrackDisplayEvent(DISPLAY_EVENT_LACKS_SERVICE_WORKER);
-    OutputDeveloperNotShownMessage(web_contents, kNoMatchingServiceWorker);
+    OutputDeveloperNotShownMessage(web_contents, kNoMatchingServiceWorker,
+                                   is_debug_mode_);
     Cancel();
     return;
   }
 
   OnHasServiceWorker(web_contents);
 }
 
 void AppBannerDataFetcher::OnHasServiceWorker(
     content::WebContents* web_contents) {
   GURL icon_url =
     ManifestIconSelector::FindBestMatchingIcon(
         web_app_data_.icons,
         ideal_icon_size_in_dp_,
         minimum_icon_size_in_dp_,
         gfx::Screen::GetScreenFor(web_contents->GetNativeView()));
 
   if (!FetchAppIcon(web_contents, icon_url)) {
-    OutputDeveloperNotShownMessage(web_contents, kCannotDetermineBestIcon);
+    OutputDeveloperNotShownMessage(web_contents, kCannotDetermineBestIcon,
+                                   is_debug_mode_);
     Cancel();
   }
 }
 
 bool AppBannerDataFetcher::FetchAppIcon(content::WebContents* web_contents,
                                         const GURL& icon_url) {
   return ManifestIconDownloader::Download(
       web_contents,
       icon_url,
       ideal_icon_size_in_dp_,
       minimum_icon_size_in_dp_,
       base::Bind(&AppBannerDataFetcher::OnAppIconFetched,
                  this));
 }
 
 void AppBannerDataFetcher::OnAppIconFetched(const SkBitmap& bitmap) {
   if (!is_active_) return;
 
   content::WebContents* web_contents = GetWebContents();
   if (!CheckFetcherIsStillAlive(web_contents)) {
     Cancel();
     return;
   }
   if (bitmap.drawsNothing()) {
-    OutputDeveloperNotShownMessage(web_contents, kNoIconAvailable);
+    OutputDeveloperNotShownMessage(web_contents, kNoIconAvailable,
+                                   is_debug_mode_);
     Cancel();
     return;
   }
 
   RecordCouldShowBanner();
-  if (!CheckIfShouldShowBanner()) {
+  if (!is_debug_mode_ && !CheckIfShouldShowBanner()) {
     // At this point, the only possible case is that the banner has been added
     // to the homescreen, given all of the other checks that have been made.
-    OutputDeveloperNotShownMessage(web_contents, kBannerAlreadyAdded);
+    OutputDeveloperNotShownMessage(web_contents, kBannerAlreadyAdded,
+                                   is_debug_mode_);
     Cancel();
     return;
   }
 
   app_icon_.reset(new SkBitmap(bitmap));
   event_request_id_ = ++gCurrentRequestID;
   web_contents->GetMainFrame()->Send(
       new ChromeViewMsg_AppBannerPromptRequest(
         web_contents->GetMainFrame()->GetRoutingID(),
         event_request_id_,
@@ skipping 19 matching lines @@
   content::WebContents* web_contents = GetWebContents();
   DCHECK(web_contents);
 
   return AppBannerSettingsHelper::ShouldShowBanner(
       web_contents, validated_url_, GetAppIdentifier(), GetCurrentTime());
 }
 
 bool AppBannerDataFetcher::CheckFetcherIsStillAlive(
     content::WebContents* web_contents) {
   if (!is_active_) {
-    OutputDeveloperNotShownMessage(web_contents,
-                                   kUserNavigatedBeforeBannerShown);
+    OutputDeveloperNotShownMessage(
+        web_contents, kUserNavigatedBeforeBannerShown, is_debug_mode_);
     return false;
   }
   if (!web_contents) {
     return false; // We cannot show a message if |web_contents| is null
   }
   return true;
 }
 
 // static
 bool AppBannerDataFetcher::IsManifestValidForWebApp(
     const content::Manifest& manifest,
-    content::WebContents* web_contents) {
+    content::WebContents* web_contents,
+    bool is_debug_mode) {
   if (manifest.IsEmpty()) {
-    OutputDeveloperNotShownMessage(web_contents, kManifestEmpty);
+    OutputDeveloperNotShownMessage(web_contents, kManifestEmpty, is_debug_mode);
     return false;
   }
   if (!manifest.start_url.is_valid()) {
-    OutputDeveloperNotShownMessage(web_contents, kStartURLNotValid);
+    OutputDeveloperNotShownMessage(web_contents, kStartURLNotValid,
+                                   is_debug_mode);
     return false;
   }
   if (manifest.name.is_null() && manifest.short_name.is_null()) {
-    OutputDeveloperNotShownMessage(web_contents,
-                                   kManifestMissingNameOrShortName);
+    OutputDeveloperNotShownMessage(
+        web_contents, kManifestMissingNameOrShortName, is_debug_mode);
     return false;
   }
   if (!DoesManifestContainRequiredIcon(manifest)) {
-    OutputDeveloperNotShownMessage(web_contents, kManifestMissingSuitableIcon);
+    OutputDeveloperNotShownMessage(web_contents, kManifestMissingSuitableIcon,
+                                   is_debug_mode);
     return false;
   }
   return true;
 }
 
 }  // namespace banners