Redo how AppBannerInfoBars are created and stored

chrome/browser/android/banners/app_banner_manager.h

 // Copyright 2014 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_ANDROID_BANNERS_APP_BANNER_MANAGER_H_
 #define CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_MANAGER_H_
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/android/banners/app_banner_infobar_delegate.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
+#include "chrome/browser/ui/android/infobars/app_banner_infobar.h"
+#include "components/infobars/core/infobar_manager.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/manifest.h"
 
 namespace content {
 struct FrameNavigateParams;
 struct LoadCommittedDetails;
 struct Manifest;
 }  // namespace content
 
+namespace infobars {
+class InfoBar;
+}  // namspace infobars
+
 /**
  * Manages when an app banner is created or dismissed.
  *
  * Hooks the wiring together for getting the data for a particular app.
  * Monitors at most one package at a time, and tracks the info for the
  * most recent app that was requested.  Any work in progress for other apps is
  * discarded.
  *
  * The procedure for creating a banner spans multiple asynchronous calls across
  * the JNI boundary, as well as querying a Service to get info about the app.
@@ skipping 66 matching lines @@
       const content::FrameNavigateParams& params) override;
   void DidFinishLoad(content::RenderFrameHost* render_frame_host,
                      const GURL& validated_url) override;
   bool OnMessageReceived(const IPC::Message& message) override;
 
   // BitmapFetcherDelegate overrides.
   void OnFetchComplete(const GURL url, const SkBitmap* bitmap) override;
 
   // AppBannerInfoBarDelegate::AppDelegate overrides.
   void Block() const override;
-  void Install() const override;
+  bool OnButtonClicked() const override;
+  void OnInfoBarDestroyed() override;
+  base::string16 GetTitle() const override;
   gfx::Image GetIcon() const override;
 
  private:
   // Gets the preferred icon size for the banner icons.
   int GetPreferredIconSize();
 
   // Called when the manifest has been retrieved, or if there is no manifest to
   // retrieve.
   void OnDidGetManifest(const content::Manifest& manifest);
 
   // Called when the renderer has returned information about the meta tag.
   // If there is some metadata for the play store tag, this kicks off the
   // process of showing a banner for the package designated by |tag_content| on
   // the page at the |expected_url|.
   void OnDidRetrieveMetaTagContent(bool success,
                                    const std::string& tag_name,
                                    const std::string& tag_content,
                                    const GURL& expected_url);
 
   // Fetches the icon for an app.
   scoped_ptr<chrome::BitmapFetcher> fetcher_;
   GURL validated_url_;
-  content::Manifest manifest_;
+  GURL app_icon_url_;
+
+  base::string16 app_title_;
   scoped_ptr<SkBitmap> app_icon_;
 
+  content::Manifest web_app_data_;
+
+  // Weak pointer to the InfoBar that is being managed.
+  AppBannerInfoBar* weak_infobar_ptr_;
+
   // AppBannerManager on the Java side.
   JavaObjectWeakGlobalRef weak_java_banner_view_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(AppBannerManager);
 };  // class AppBannerManager
 
 // Register native methods
 bool RegisterAppBannerManager(JNIEnv* env);
 
 }  // namespace banners
 
 #endif  // CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_MANAGER_H_