mash: Update shelf pin prefs in ShelfModelObserver overrides.

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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
index 95de7dce5a6abb9900406e928c3c5ac8ef62339e..7de02198a6eddf6ed94da566ec440dede22228b6 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
@@ -7,6 +7,7 @@
 
 #include <list>
 #include <memory>
+#include <set>
 
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/shelf/shelf_model_observer.h"
@@ -142,6 +143,8 @@ class ChromeLauncherControllerImpl
                     const std::string& app_id) override;
   void OnAppUninstalledPrepared(content::BrowserContext* browser_context,
                                 const std::string& app_id) override;
+  void OnAppDisabling(const std::string& app_id) override;
+  void OnAppDisabled(const std::string& app_id) override;
 
  protected:
   // ChromeLauncherController:
@@ -309,6 +312,9 @@ class ChromeLauncherControllerImpl
   typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap;
   RunningAppListIdMap last_used_running_application_order_;
 
+  // Ids of apps being disabled; do not remove pin positions on item removal.
+  std::set<std::string> keep_pin_positions_;

[James Cook, 2017/03/29 14:28:02]

Could this be handled with ignore_persistent_pinned_state_change_?

If not, and this just exists for arc, either the name or the comment should say
something about arc.

Also, it seems like this only works for apps without a launch id, which probably
depends on ARC never using a launch id.

[khmel, 2017/03/29 15:28:53]

It seems that based on logic we don't have situation when multiple apps' ids
comes to this set. Would it be possible to use something like std::string
arc_app_id_keep_pin_? In .cc we can use DCHECK(arc_app_id_keep_pin.empty()) on
OnAppDisabling and arc_app_id_keep_pin = std::string(). WDYT?

[msw, 2017/03/29 21:34:17]

I switched to using a refactored sync flag, which seems sufficient for now. I
can revise the approach if we encounter any issues.

+
   base::WeakPtrFactory<ChromeLauncherControllerImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerImpl);