Fixing M32 crasher where closing of a windowed V1 app on a visiting desktop will cause crashes late…

chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc

 // 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.
 
 #include "chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
@@ skipping 12 matching lines @@
 MultiProfileBrowserStatusMonitor::~MultiProfileBrowserStatusMonitor() {
 }
 
 void MultiProfileBrowserStatusMonitor::ActiveUserChanged(
     const std::string& user_email) {
   // Handle windowed apps.
   for (AppList::iterator it = app_list_.begin(); it != app_list_.end(); ++it) {
     bool owned = multi_user_util::IsProfileFromActiveUser((*it)->profile());
     bool shown = IsV1AppInShelf(*it);
     if (owned && !shown)
-      BrowserStatusMonitor::AddV1AppToShelf(*it);
+      ConnectV1AppToLauncher(*it);
     else if (!owned && shown)
-      BrowserStatusMonitor::RemoveV1AppFromShelf(*it);
+      DisconnectV1AppFromLauncher(*it);
   }
 
   // Handle apps in browser tabs: Add the new applications.
   BrowserList* browser_list =
       BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
 
   // Remove old (tabbed V1) applications.
   for (BrowserList::const_iterator it = browser_list->begin();
        it != browser_list->end(); ++it) {
     Browser* browser = *it;
@@ skipping 43 matching lines @@
 
 void MultiProfileBrowserStatusMonitor::RemoveV1AppFromShelf(Browser* browser) {
   DCHECK(browser->is_type_popup() && browser->is_app());
   AppList::iterator it = std::find(app_list_.begin(), app_list_.end(), browser);
   DCHECK(it != app_list_.end());
   app_list_.erase(it);
   if (multi_user_util::IsProfileFromActiveUser(browser->profile())) {
     BrowserStatusMonitor::RemoveV1AppFromShelf(browser);
   }
 }
+
+void MultiProfileBrowserStatusMonitor::ConnectV1AppToLauncher(
+    Browser* browser) {
+  // Adding a V1 app to the launcher consists of two actions: Add the browser
+  // (launcher item) and add the content (launcher item status).
+  BrowserStatusMonitor::AddV1AppToShelf(browser);
+  launcher_controller_->UpdateAppState(
+      browser->tab_strip_model()->GetActiveWebContents(),
+      ChromeLauncherController::APP_STATE_INACTIVE);
+}
+
+void MultiProfileBrowserStatusMonitor::DisconnectV1AppFromLauncher(
+    Browser* browser) {
+  // Removing a V1 app from the launcher requires to remove the content and
+  // the launcher item.
+  launcher_controller_->UpdateAppState(
+      browser->tab_strip_model()->GetActiveWebContents(),
+      ChromeLauncherController::APP_STATE_REMOVED);
+  BrowserStatusMonitor::RemoveV1AppFromShelf(browser);
+}