mash: Support ShelfModel access in Chrome.

chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

 // Copyright 2013 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_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/public/cpp/shelf_item_delegate.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/public/interfaces/shelf.mojom.h"
 #include "ash/shelf/shelf_model_observer.h"
 #include "base/auto_reset.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/app_icon_loader_delegate.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/browser/ui/ash/launcher/launcher_app_updater.h"
 #include "chrome/browser/ui/ash/launcher/settings_window_observer.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "components/sync_preferences/pref_service_syncable_observer.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
+#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/interface_ptr_set.h"
 
 class AccountId;
 class AppIconLoader;
 class AppSyncUIState;
 class AppWindowLauncherController;
 class ArcAppDeferredLauncherController;
 class BrowserShortcutLauncherItemController;
 class BrowserStatusMonitor;
 class ChromeLauncherControllerUserSwitchObserver;
 class ChromeLauncherPrefsObserver;
@@ skipping 19 matching lines @@
 class BaseWindow;
 }
 
 // ChromeLauncherController helps manage Ash's shelf for Chrome prefs and apps.
 // It helps synchronize shelf state with profile preferences and app content.
 // NOTE: Launcher is an old name for the shelf, this class should be renamed.
 class ChromeLauncherController
     : public LauncherAppUpdater::Delegate,
       public AppIconLoaderDelegate,
       private ash::mojom::ShelfObserver,
+      private ash::mojom::ShelfModelObserver,
       private ash::ShelfModelObserver,
       private ash::WindowTreeHostManager::Observer,
       private AppSyncUIStateObserver,
       private app_list::AppListSyncableService::Observer,
       private sync_preferences::PrefServiceSyncableObserver {
  public:
   // Used to update the state of non plaform apps, as web contents change.
   enum AppState {
     APP_STATE_ACTIVE,
     APP_STATE_WINDOW_ACTIVE,
@@ skipping 268 matching lines @@
   // deleted.
   void CloseWindowedAppsFromRemovedExtension(const std::string& app_id,
                                              const Profile* profile);
 
   // Attach to a specific profile.
   void AttachProfile(Profile* profile_to_attach);
 
   // Forget the current profile to allow attaching to a new one.
   void ReleaseProfile();
 
+  // Add an observer for the local ShelfModel. Called by ash::ShelfController as
+  // a callback to establish two-way synchronization of ShelfModel state.
+  void LinkShelfModels(ash::mojom::ShelfModelObserverPtr observer,
+                       const std::vector<ash::ShelfItem>& items);
+
   // ash::mojom::ShelfObserver:
   void OnShelfInitialized(int64_t display_id) override;
   void OnAlignmentChanged(ash::ShelfAlignment alignment,
                           int64_t display_id) override;
   void OnAutoHideBehaviorChanged(ash::ShelfAutoHideBehavior auto_hide,
                                  int64_t display_id) override;
 
+  // ash::mojom::ShelfModelObserver:
+  void OnShelfItemAdded(int32_t index, const ash::ShelfItem& item) override;
+  void OnShelfItemRemoved(int32_t index, const ash::ShelfItem& item) override;
+  void OnShelfItemMoved(int32_t start_index, int32_t target_index) override;
+  void OnShelfItemChanged(int32_t index, const ash::ShelfItem& item) override;
+  void OnShelfItemDelegateChanged(
+      const ash::ShelfID& id,
+      ash::mojom::ShelfItemDelegatePtr delegate) override;
+
   // ash::ShelfModelObserver:
   void ShelfItemAdded(int index) override;
   void ShelfItemRemoved(int index, const ash::ShelfItem& old_item) override;
   void ShelfItemMoved(int start_index, int target_index) override;
   void ShelfItemChanged(int index, const ash::ShelfItem& old_item) override;
+  void ShelfItemDelegateChanged(const ash::ShelfID& id,
+                                ash::ShelfItemDelegate* delegate) override;
 
   // ash::WindowTreeHostManager::Observer:
   void OnDisplayConfigurationChanged() override;
 
   // AppSyncUIStateObserver:
   void OnAppSyncUIStatusChanged() override;
 
   // app_list::AppListSyncableService::Observer:
   void OnSyncModelUpdated() override;
 
@@ skipping 14 matching lines @@
 
   // Ash's mojom::ShelfController used to change shelf state.
   ash::mojom::ShelfControllerPtr shelf_controller_;
 
   // The binding this instance uses to implment mojom::ShelfObserver
   mojo::AssociatedBinding<ash::mojom::ShelfObserver> observer_binding_;
 
   // True when setting a shelf pref in response to an observer notification.
   bool updating_shelf_pref_from_observer_ = false;
 
+  // Binding for observation of the remote ShelfModel owned by Ash.
+  ash::mojom::ShelfModelObserverRequest shelf_model_observer_request_;
+  mojo::Binding<ash::mojom::ShelfModelObserver> shelf_model_observer_binding_;
+
+  // True when applying changes from the remote ShelfModel owned by Ash.
+  // Changes to the local ShelfModel should not be reported during this time.
+  bool applying_remote_shelf_model_changes_ = false;
+
+  // The set of shelf model observers notified about shelf model changes.
+  mojo::InterfacePtrSet<ash::mojom::ShelfModelObserver> shelf_model_observers_;
+
   // When true, changes to pinned shelf items should update the sync model.
   bool should_sync_pin_changes_ = true;
 
   // Used to get app info for tabs.
   std::unique_ptr<LauncherControllerHelper> launcher_controller_helper_;
 
   // An observer that manages the shelf title and icon for settings windows.
   SettingsWindowObserver settings_window_observer_;
 
   // Used to load the images for app items.
@@ skipping 29 matching lines @@
   using RunningAppListIds = std::vector<std::string>;
   using RunningAppListIdMap = std::map<std::string, RunningAppListIds>;
   RunningAppListIdMap last_used_running_application_order_;
 
   base::WeakPtrFactory<ChromeLauncherController> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_