Enhance chrome.app.window API for shelf integration with pinning support (cont.)

chrome/browser/ui/ash/chrome_launcher_prefs.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 
 #include <stddef.h>
 
 #include <set>
 
@@ skipping 622 matching lines @@
   }
 
   // Sort pins according their ordinals.
   std::sort(pin_infos.begin(), pin_infos.end(), ComparePinInfo());
 
   // Pinned by policy apps appear first, if they were not shown before.
   syncer::StringOrdinal front_position = GetFirstPinPosition(helper->profile());
   std::vector<AppLauncherId>::const_reverse_iterator it;
   for (it = policy_apps.app_list().rbegin();
        it != policy_apps.app_list().rend(); ++it) {
-    const std::string& app_id = (*it).ToString();
-    if (app_id == kPinnedAppsPlaceholder)
+    const std::string& app_launcher_id_str = (*it).ToString();
+    if (app_launcher_id_str == kPinnedAppsPlaceholder)
       continue;
 
     // Check if we already processed current app.
-    if (app_service->GetPinPosition(app_id).IsValid())
+    if (app_service->GetPinPosition(app_launcher_id_str).IsValid())
       continue;
 
     // Now move it to the front.
     pin_infos.insert(pin_infos.begin(),
-                     PinInfo(AppLauncherId(app_id), front_position));
-    app_service->SetPinPosition(app_id, front_position);
+                     PinInfo(AppLauncherId((*it).app_id(), (*it).launch_id()),
+                             front_position));
+    app_service->SetPinPosition(app_launcher_id_str, front_position);
     front_position = front_position.CreateBefore();
   }
 
   // Now insert Chrome browser app if needed.
   if (!app_service->GetPinPosition(extension_misc::kChromeAppId).IsValid()) {
     pin_infos.insert(
         pin_infos.begin(),
         PinInfo(AppLauncherId(extension_misc::kChromeAppId), front_position));
     app_service->SetPinPosition(extension_misc::kChromeAppId, front_position);
   }
@@ skipping 73 matching lines @@
     pin_position = position_before.CreateAfter();
   else if (position_after.IsValid())
     pin_position = position_after.CreateBefore();
   else
     pin_position = syncer::StringOrdinal::CreateInitialOrdinal();
   app_service->SetPinPosition(app_launcher_id_str, pin_position);
 }
 
 }  // namespace launcher
 }  // namespace ash