Apps shouldn't disappear from pinned list after update

chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.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/views/ash/launcher/chrome_launcher_delegate.h"
 
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_types.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
@@ skipping 88 matching lines @@
   instance_ = this;
   model_->AddObserver(this);
   app_icon_loader_.reset(new LauncherAppIconLoader(profile_, this));
 
   registrar_.Add(this,
                  chrome::NOTIFICATION_EXTENSION_LOADED,
                  content::Source<Profile>(profile_));
   registrar_.Add(this,
                  chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(profile_));
+  registrar_.Add(this,
+                 chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
+                 content::Source<Profile>(profile_));
 }
 
 ChromeLauncherDelegate::~ChromeLauncherDelegate() {
   model_->RemoveObserver(this);
   for (IDToItemMap::iterator i = id_to_item_map_.begin();
        i != id_to_item_map_.end(); ++i) {
     model_->RemoveItemAt(model_->ItemIndexByID(i->first));
   }
   if (instance_ == this)
     instance_ = NULL;
@@ skipping 29 matching lines @@
     DictionaryValue* app = NULL;
     if (pinned_apps->GetDictionary(i, &app)) {
       std::string app_id;
       if (app->GetString(kAppIDPath, &app_id)) {
         if (app_icon_loader_->IsValidID(app_id)) {
           CreateAppLauncherItem(NULL, app_id, ash::STATUS_CLOSED);
         } else {
           Item pending_item;
           pending_item.item_type = TYPE_APP;
           pending_item.app_id = app_id;
-          pending_pinned_apps_.push(pending_item);
+          pending_pinned_apps_.push_back(pending_item);
         }
       }
     }
   }
   // TODO(sky): update unit test so that this test isn't necessary.
   if (ash::Shell::HasInstance()) {
     std::string behavior_value(
         profile_->GetPrefs()->GetString(prefs::kShelfAutoHideBehavior));
     ash::ShelfAutoHideBehavior behavior =
         ash::SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT;
@@ skipping 365 matching lines @@
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_EXTENSION_LOADED: {
       ProcessPendingPinnedApps();
       break;
     }
     case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
       const Extension* extension =
           content::Details<UnloadedExtensionInfo>(details)->extension;
-      UnpinAppsWithID(extension->id());
+      if (IsAppPinned(extension->id())) {
+        // TODO(dpolukhin): also we need to remember index of the app to show
+        // it on the same place when it gets loaded again.
+        Item pending_item;
+        pending_item.item_type = TYPE_APP;
+        pending_item.app_id = extension->id();
+        pending_pinned_apps_.push_back(pending_item);
+        UnpinAppsWithID(extension->id());
+      }
+      break;
+    }
+    case chrome::NOTIFICATION_EXTENSION_UNINSTALLED: {
+      std::string id = *content::Details<const std::string>(details).ptr();
+      for (std::deque<Item>::iterator it = pending_pinned_apps_.begin();
+           it != pending_pinned_apps_.end(); ++it) {
+        if (it->app_id == id) {
+          pending_pinned_apps_.erase(it);
+          break;
+        }
+      }
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification type=" << type;
   }
 }
 
 void ChromeLauncherDelegate::PersistPinnedState() {
   // Set kUseDefaultPinnedApps to false and use pinned apps list from prefs
   // from now on.
@@ skipping 24 matching lines @@
 }
 
 void ChromeLauncherDelegate::ProcessPendingPinnedApps() {
   while (!pending_pinned_apps_.empty()) {
     const Item& item = pending_pinned_apps_.front();
 
     if (!app_icon_loader_->IsValidID(item.app_id))
       return;
 
     PinAppWithID(item.app_id);
-    pending_pinned_apps_.pop();
+    pending_pinned_apps_.pop_front();
   }
 }