[Extensions] Rework inline installation observation

chrome/browser/extensions/tab_helper.h

 // Copyright (c) 2012 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_EXTENSIONS_TAB_HELPER_H_
 #define CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
 
 #include <memory>
 #include <set>
 #include <string>
@@ skipping 108 matching lines @@
   // Sets a non-extension app icon associated with WebContents and fires an
   // INVALIDATE_TYPE_TITLE navigation state change to trigger repaint of title.
   void SetAppIcon(const SkBitmap& app_icon);
 
   // Sets the factory used to create inline webstore item installers.
   // Used for testing. Takes ownership of the factory instance.
   void SetWebstoreInlineInstallerFactoryForTests(
       WebstoreInlineInstallerFactory* factory);
 
  private:
+  class InlineInstallObserver;
+
   // Utility function to invoke member functions on all relevant
   // ContentRulesRegistries.
   template <class Func>
   void InvokeForContentRulesRegistries(const Func& func);
 
   // Different types of action when web app info is available.
   // OnDidGetApplicationInfo uses this to dispatch calls.
   enum WebAppAction {
     NONE,               // No action at all.
     CREATE_SHORTCUT,    // Bring up create application shortcut dialog.
@@ skipping 52 matching lines @@
   // the extension's image asynchronously.
   void UpdateExtensionAppIcon(const Extension* extension);
 
   const Extension* GetExtension(const std::string& extension_app_id);
 
   void OnImageLoaded(const gfx::Image& image);
 
   // WebstoreStandaloneInstaller::Callback.
   void OnInlineInstallComplete(int install_id,
                                int return_route_id,
+                               const std::string& extension_id,
                                bool success,
                                const std::string& error,
                                webstore_install::Result result);
 
   // ExtensionReenabler::Callback.
   void OnReenableComplete(int install_id,
                           int return_route_id,
+                          const std::string& extension_id,
                           ExtensionReenabler::ReenableResult result);
 
   // content::NotificationObserver.
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   // Requests application info for the specified page. This is an asynchronous
   // request. The delegate is notified by way of OnDidGetApplicationInfo when
   // the data is available.
@@ skipping 45 matching lines @@
   // Creates WebstoreInlineInstaller instances for inline install triggers.
   std::unique_ptr<WebstoreInlineInstallerFactory>
       webstore_inline_installer_factory_;
 
   // The reenable prompt for disabled extensions, if any.
   std::unique_ptr<ExtensionReenabler> extension_reenabler_;
 
   ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
       registry_observer_;
 
+  std::map<std::string, std::unique_ptr<InlineInstallObserver>>

[lazyboy, 2016/06/29 21:03:04]

Add comment describing this member. or maybe use ExtensionId instead of
std::string to self describe. 

[Devlin, 2016/06/29 22:32:09]

Done. Opted against ExtensionId because a) it would involve #including the
heavy-weight extension.h file* and b) it's inconsistent with the rest of this
file.

* We should probably pull it out into extension_id.h
** We should probably fix that, too, but out of scope for this change.

[lazyboy, 2016/06/29 23:10:27]

Acknowledged.

+      install_observers_;
+
+  // The set of extension ids that are currently being installed.
+  std::set<std::string> pending_inline_installations_;
+
   // Vend weak pointers that can be invalidated to stop in-progress loads.
   base::WeakPtrFactory<TabHelper> image_loader_ptr_factory_;
 
   // Generic weak ptr factory for posting callbacks.
   base::WeakPtrFactory<TabHelper> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TabHelper);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_