Implement app banner info bars on desktop.

chrome/browser/banners/app_banner_data_fetcher.h

 // 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.
 
 #ifndef CHROME_BROWSER_BANNERS_APP_BANNER_DATA_FETCHER_H_
 #define CHROME_BROWSER_BANNERS_APP_BANNER_DATA_FETCHER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_delegate.h"
+#include "chrome/common/web_application_info.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/manifest.h"
 #include "third_party/WebKit/public/platform/modules/app_banner/WebAppBannerPromptReply.h"
 
 namespace chrome {
 class BitmapFetcher;
 }  // namespace chrome
 
+namespace extensions {
+class BookmarkAppHelper;
+class Extension;
+}  // namespace extensions

[benwells, 2015/06/02 05:53:35]

The generic fetcher class is now polluted with desktop only stuff. Can we have a
app_banner_data_fetcher_desktop instead?

[dominickn (DO NOT USE), 2015/06/02 06:51:32]

This also means either adding an AppBannerManagerDesktop, or making the existing
AppBannerManager create an AppBannerDataFetcherDesktop instead of the currently
AppBannerDataFetcher.

I didn't add an explicit desktop version because I conceptualised the Android
one as overriding the desktop implementation, rather than both inheriting from a
single source. I felt like the number of desktop-specific pollutions in the
fetcher class was limited enough to not justify an additional couple of classes.
Thoughts?

+
 namespace infobars {
 class InfoBar;
 }  // namespace infobars
 
 namespace banners {
 class AppBannerDataFetcher;
 
 // Fetches data required to show a web app banner for the URL currently shown by
 // the WebContents.
 class AppBannerDataFetcher
@@ skipping 50 matching lines @@
   const GURL& validated_url() { return validated_url_; }
 
   // WebContentsObserver overrides.
   void WebContentsDestroyed() override;
   void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) override;
   bool OnMessageReceived(const IPC::Message& message,
                          content::RenderFrameHost* render_frame_host) override;
 
+  // Callback for finishing bookmark app creation
+  void FinishCreateBookmarkApp(const extensions::Extension* extension,
+                               const WebApplicationInfo& web_app_info);
+
  protected:
   ~AppBannerDataFetcher() override;
 
   // Return a string describing what type of banner is being created. Used when
   // alerting websites that a banner is about to be created.
   virtual std::string GetBannerType();
 
   // Called after the manager sends a message to the renderer regarding its
   // intention to show a prompt. The renderer will send a message back with the
   // opportunity to cancel.
@@ skipping 12 matching lines @@
   bool FetchIcon(const GURL& image_url);
 
   // Creates a banner for the app using the given |icon|.
   virtual infobars::InfoBar* CreateBanner(const SkBitmap* icon,
                                           const base::string16& title);
 
   // Records that a banner was shown. The |event_name| corresponds to the RAPPOR
   // metric being recorded.
   void RecordDidShowBanner(const std::string& event_name);
 
+#if !defined(OS_ANDROID)
+  scoped_ptr<extensions::BookmarkAppHelper> bookmark_app_helper_;
+#endif
+
  private:
   // Callbacks for data retrieval.
   void OnDidGetManifest(const content::Manifest& manifest);
   void OnDidCheckHasServiceWorker(bool has_service_worker);
   void OnFetchComplete(const GURL& url, const SkBitmap* icon) override;
 
   // Shows a banner for the app, if the given |icon| is valid.
   virtual void ShowBanner(const SkBitmap* icon);
 
   // Record that the banner could be shown at this point, if the triggering
@@ skipping 25 matching lines @@
   content::Manifest web_app_data_;
 
   friend class AppBannerDataFetcherUnitTest;
   friend class base::RefCounted<AppBannerDataFetcher>;
   DISALLOW_COPY_AND_ASSIGN(AppBannerDataFetcher);
 };
 
 }  // namespace banners
 
 #endif  // CHROME_BROWSER_BANNERS_APP_BANNER_DATA_FETCHER_H_