arc: Revamp the ArcBridgeService interface

chrome/browser/ui/app_list/arc/arc_app_list_prefs.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_UI_APP_LIST_ARC_ARC_APP_LIST_PREFS_H_
 #define CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_LIST_PREFS_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/common/app.mojom.h"
+#include "components/arc/instance_holder.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "ui/base/layout.h"
 
 class PrefService;
 
 namespace arc {
 class ArcBridgeService;
 }  // namespace arc
 
 namespace content {
 class BrowserContext;
 }  // namespace content
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }  // namespace user_prefs
 
 // Declares shareable ARC app specific preferences, that keep information
 // about app attributes (name, package_name, activity) and its state. This
 // information is used to pre-create non-ready app items while ARC bridge
 // service is not ready to provide information about available ARC apps.
 // NOTE: ArcAppListPrefs is only created for the primary user.
-class ArcAppListPrefs : public KeyedService,
-                        public arc::mojom::AppHost,
-                        public arc::ArcBridgeService::Observer,
-                        public arc::ArcAuthService::Observer {
+class ArcAppListPrefs
+    : public KeyedService,
+      public arc::mojom::AppHost,
+      public arc::ArcBridgeService::Observer,
+      public arc::InstanceHolder<arc::mojom::AppInstance>::Observer,
+      public arc::ArcAuthService::Observer {
  public:
   struct AppInfo {
     AppInfo(const std::string& name,
             const std::string& package_name,
             const std::string& activity,
             const std::string& intent_uri,
             const std::string& icon_resource_id,
             const base::Time& last_launch_time,
             bool sticky,
             bool notifications_enabled,
@@ skipping 139 matching lines @@
   void RemoveApp(const std::string& app_id);
 
  private:
   friend class ChromeLauncherControllerImplTest;
 
   // See the Create methods.
   ArcAppListPrefs(const base::FilePath& base_path, PrefService* prefs);
 
   // arc::ArcBridgeService::Observer:
   void OnBridgeStopped() override;
-  void OnAppInstanceReady() override;
-  void OnAppInstanceClosed() override;
+
+  // arc::InstanceHolder<arc::mojom::AppInstance>::Observer:
+  void OnInstanceReady() override;
+  void OnInstanceClosed() override;
 
   // arc::mojom::AppHost:
   void OnAppListRefreshed(mojo::Array<arc::mojom::AppInfoPtr> apps) override;
   void OnAppAdded(arc::mojom::AppInfoPtr app) override;
   void OnInstallShortcut(arc::mojom::ShortcutInfoPtr app) override;
   void OnPackageRemoved(const mojo::String& package_name) override;
   void OnAppIcon(const mojo::String& package_name,
                  const mojo::String& activity,
                  arc::mojom::ScaleFactor scale_factor,
                  mojo::Array<uint8_t> icon_png_data) override;
@@ skipping 61 matching lines @@
   bool apps_restored_ = false;
 
   mojo::Binding<arc::mojom::AppHost> binding_;
 
   base::WeakPtrFactory<ArcAppListPrefs> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcAppListPrefs);
 };
 
 #endif  // CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_LIST_PREFS_H_