mash: Update shelf pin prefs in ShelfModelObserver overrides.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.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_IMPL_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_
 
 #include <list>
 #include <memory>
+#include <set>
 
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/shelf/shelf_model_observer.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
@@ skipping 115 matching lines @@
   bool IsAppPinned(const std::string& app_id) override;
   void UnpinAppWithID(const std::string& app_id) override;
 
   // LauncherAppUpdater::Delegate:
   void OnAppInstalled(content::BrowserContext* browser_context,
                       const std::string& app_id) override;
   void OnAppUpdated(content::BrowserContext* browser_context,
                     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:
   void OnInit() override;
 
   // Creates a new app shortcut item and controller on the shelf at |index|.
   // Use kInsertItemAtEnd to add a shortcut as the last item.
   ash::ShelfID CreateAppShortcutLauncherItem(
       const ash::AppLaunchId& app_launch_id,
       int index);
@@ skipping 147 matching lines @@
 
   // If true, incoming pinned state changes should be ignored.
   bool ignore_persist_pinned_state_change_ = false;
 
   // The list of running & un-pinned applications for different users on hidden
   // desktops.
   typedef std::vector<std::string> RunningAppListIds;
   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);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_