Implement app banner info bars on desktop.

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/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/banners/app_banner_debug_log.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/manifest/manifest_icon_selector.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/render_messages.h"
-#include "components/infobars/core/infobar.h"
 #include "components/rappor/rappor_utils.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/service_worker_context.h"
 #include "content/public/browser/storage_partition.h"
 #include "net/base/load_flags.h"
 #include "third_party/WebKit/public/platform/modules/app_banner/WebAppBannerPromptReply.h"
 #include "ui/gfx/screen.h"
@@ skipping 121 matching lines @@
   if (reply == blink::WebAppBannerPromptReply::Cancel) {
     OutputDeveloperNotShownMessage(web_contents, kRendererRequestCancel);
     Cancel();
     return;
   }
 
   // Definitely going to show the banner now.
   FOR_EACH_OBSERVER(Observer, observer_list_,
                     OnDecidedWhetherToShow(this, true));
 
-  infobars::InfoBar* infobar = CreateBanner(app_icon_.get(), app_title_);
-  if (infobar) {
-    InfoBarService::FromWebContents(web_contents)->AddInfoBar(
-        make_scoped_ptr(infobar));
-  }
+  ShowBanner(app_icon_.get(), app_title_);
   is_active_ = false;
 }
 
 AppBannerDataFetcher::~AppBannerDataFetcher() {
   FOR_EACH_OBSERVER(Observer, observer_list_, OnFetcherDestroyed(this));
 }
 
 std::string AppBannerDataFetcher::GetBannerType() {
   return "web";
 }
@@ skipping 22 matching lines @@
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   bitmap_fetcher_.reset(new chrome::BitmapFetcher(image_url, this));
   bitmap_fetcher_->Start(
       profile->GetRequestContext(),
       std::string(),
       net::URLRequest::CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE,
       net::LOAD_NORMAL);
   return true;
 }
 
-infobars::InfoBar* AppBannerDataFetcher::CreateBanner(
-    const SkBitmap* icon,
-    const base::string16& title) {
+// This method is overridden on Android and desktop to provide
+// platform-specific implementations.
+void AppBannerDataFetcher::ShowBanner(const SkBitmap* icon,
+                                      const base::string16& title) {
   content::WebContents* web_contents = GetWebContents();
   DCHECK(web_contents && !web_app_data_.IsEmpty());

[benwells, 2015/06/03 06:13:55]

I think you can remove this method's implementation and leave
AppBannerDataFetcher abstract.

[dominickn (DO NOT USE), 2015/06/03 07:10:36]

Done. This also required making the manager abstract.

 
-  // TODO(dfalcantara): Desktop doesn't display app banners, yet.  Just pretend
-  //                    that a banner was shown for testing purposes.
+  // The actual display of the banner is platform specific, and implemented in
+  // the Android and Desktop subclasses of the data fetcher. No banner is
+  // displayed in this implementation: just record that a banner was shown.
   RecordDidShowBanner("AppBanner.WebApp.Shown");
-  return nullptr;
 }
 
 void AppBannerDataFetcher::RecordDidShowBanner(const std::string& event_name) {
   content::WebContents* web_contents = GetWebContents();
   DCHECK(web_contents);
 
   AppBannerSettingsHelper::RecordBannerEvent(
       web_contents, validated_url_, GetAppIdentifier(),
       AppBannerSettingsHelper::APP_BANNER_EVENT_DID_SHOW,
       GetCurrentTime());
@@ skipping 75 matching lines @@
     TrackDisplayEvent(DISPLAY_EVENT_LACKS_SERVICE_WORKER);
     OutputDeveloperNotShownMessage(web_contents, kNoMatchingServiceWorker);
   }
 
   Cancel();
 }
 
 void AppBannerDataFetcher::OnFetchComplete(const GURL& url,
                                            const SkBitmap* icon) {
   if (is_active_)
-    ShowBanner(icon);
+    RequestShowBanner(icon);
 
   Release();
 }
 
-void AppBannerDataFetcher::ShowBanner(const SkBitmap* icon) {
+void AppBannerDataFetcher::RequestShowBanner(const SkBitmap* icon) {
   content::WebContents* web_contents = GetWebContents();
   if (!CheckFetcherIsStillAlive(web_contents)) {
     Cancel();
     return;
   }
   if (!icon) {
     OutputDeveloperNotShownMessage(web_contents, kNoIconAvailable);
     Cancel();
     return;
   }
@@ skipping 65 matching lines @@
     return false;
   }
   if (!DoesManifestContainRequiredIcon(manifest)) {
     OutputDeveloperNotShownMessage(web_contents, kManifestMissingSuitableIcon);
     return false;
   }
   return true;
 }
 
 }  // namespace banners