Fixed problems with pin/unpin preferences changing for not running applications & icon order chang…

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 <list>
 #include <map>
 #include <set>
@@ skipping 68 matching lines @@
 // ChromeLauncherController manages the launcher items needed for content
 // windows. Launcher items have a type, an optional app id, and a controller.
 // This incarnation groups running tabs/windows in application specific lists.
 // * Browser app windows have BrowserLauncherItemController, owned by the
 //   BrowserView instance.
 // * App shell windows have ShellWindowLauncherItemController, owned by
 //   ShellWindowLauncherController.
 // * Shortcuts have no LauncherItemController.
 // TODO(simon.hong81): Move LauncherItemDelegate out from
 // ChromeLauncherController and makes separate subclass with it.
-class ChromeLauncherController
-    : public ash::LauncherDelegate,
-      public ash::LauncherItemDelegate,
-      public ash::LauncherModelObserver,
-      public ash::ShellObserver,
-      public ash::DisplayController::Observer,
-      public content::NotificationObserver,
-      public extensions::AppIconLoader::Delegate,
-      public PrefServiceSyncableObserver,
-      public AppSyncUIStateObserver,
-      public ExtensionEnableFlowDelegate,
-      public ash::ShelfLayoutManagerObserver {
+class ChromeLauncherController : public ash::LauncherDelegate,
+                                 public ash::LauncherItemDelegate,
+                                 public ash::LauncherModelObserver,
+                                 public ash::ShellObserver,
+                                 public ash::DisplayController::Observer,
+                                 public content::NotificationObserver,
+                                 public extensions::AppIconLoader::Delegate,
+                                 public PrefServiceSyncableObserver,
+                                 public AppSyncUIStateObserver,
+                                 public ExtensionEnableFlowDelegate,
+                                 public ash::ShelfLayoutManagerObserver {
  public:
   // Indicates if a launcher item is incognito or not.
   enum IncognitoState {
     STATE_INCOGNITO,
     STATE_NOT_INCOGNITO,
   };
 
   // Used to update the state of non plaform apps, as web contents change.
   enum AppState {
     APP_STATE_ACTIVE,
@@ skipping 302 matching lines @@
   Profile* GetProfileForNewWindows();
 
   // Invoked when the associated browser or app is closed.
   void LauncherItemClosed(ash::LauncherID id);
 
   // Internal helpers for pinning and unpinning that handle both
   // client-triggered and internal pinning operations.
   void DoPinAppWithID(const std::string& app_id);
   void DoUnpinAppWithID(const std::string& app_id);
 
+  // Pin a running app with |launcher_id| internally to |index|. It returns
+  // the index where the item was pinned. Note that this will not update the
+  // preferences.
+  int PinRunningAppInternal(int index, ash::LauncherID launcher_id);
+
+  // Unpin a locked application. This is an internal call which converts the
+  // model type of the given app index from a shortcut into an unpinned running
+  // app.
+  void UnpinRunningAppInternal(int index);
+
   // Re-syncs launcher model with prefs::kPinnedLauncherApps.
   void UpdateAppLaunchersFromPref();
 
   // Persists the shelf auto-hide behavior to prefs.
   void SetShelfAutoHideBehaviorPrefs(ash::ShelfAutoHideBehavior behavior,
                                      aura::RootWindow* root_window);
 
   // Sets the shelf auto-hide behavior from prefs.
   void SetShelfAutoHideBehaviorFromPrefs();
 
@@ skipping 19 matching lines @@
   bool HasItemController(ash::LauncherID id) const;
 
   // Enumerate all Web contents which match a given shortcut |controller|.
   std::vector<content::WebContents*> GetV1ApplicationsFromController(
       LauncherItemController* controller);
 
   // Create LauncherItem for Browser Shortcut.
   ash::LauncherID CreateBrowserShortcutLauncherItem();
 
   // Check if the given |web_contents| is in incognito mode.
   bool IsIncognito(content::WebContents* web_contents) const;

[oshima, 2013/09/19 21:42:11]

can web_content be const?

[Mr4D (OOO till 08-26), 2013/09/19 22:31:50]

Done.

 
   // Update browser shortcut's index.
   void PersistChromeItemIndex(int index);
 
   // Get browser shortcut's index from pref.
   int GetChromeIconIndexFromPref() const;
 
+  // Get the browser shortcut's index in the shelf using the current's systems
+  // configuration of pinned and known (but not running) apps.
+  int GetChromeIconIndexForCreation();
+
+  // Get the list of pinned programs from the preferences.
+  void GetListOfPinnedAppsAndBrowser(std::vector<std::string>* pinned_apps);

[oshima, 2013/09/19 21:42:11]

Just return std::vector<std::string>
(See http://en.wikipedia.org/wiki/Return_value_optimization)

[Mr4D (OOO till 08-26), 2013/09/19 22:31:50]

Done.

+
   // Close all windowed V1 applications of a certain extension which was already
   // deleted.
   void CloseWindowedAppsFromRemovedExtension(const std::string& app_id);
 
   // Move a launcher item ignoring the pinned state changes from |index| to
   // |target_index|.
   void MoveItemWithoutPinnedStateChangeNotification(int source_index,
                                                     int target_index);
 
   // Register LauncherItemDelegate.
@@ skipping 50 matching lines @@
   // A special observer class to detect user switches.
   scoped_ptr<ChromeLauncherControllerUserSwitchObserver> user_switch_observer_;
 
   // If true, incoming pinned state changes should be ignored.
   bool ignore_persist_pinned_state_change_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_