Fixing problem with minimizing of applications to incorrect locations

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

 // Copyright (c) 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/browser_shortcut_launcher_item_controller.h"
 
 #include <vector>
 
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_model.h"
@@ skipping 85 matching lines @@
 
   if (browser_status != browser_item.status) {
     browser_item.status = browser_status;
     model->Set(browser_index, browser_item);
   }
 }
 
 void BrowserShortcutLauncherItemController::SetShelfIDForBrowserWindowContents(
     Browser* browser,
     content::WebContents* web_contents) {
-  if (!IsBrowserRepresentedInBrowserList(browser))
+  // We need to call SetShelfIDForWindow for V1 applications since they are
+  // content which might change and as such change the application type.
+  if (!browser ||
+      !launcher_controller()->IsBrowserFromActiveUser(browser) ||
+      browser->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH ||
+      chrome::IsTrustedPopupWindowWithScheme(browser, content::kChromeUIScheme))
     return;
+
   ash::SetShelfIDForWindow(
       launcher_controller()->GetShelfIDForWebContents(web_contents),
       browser->window()->GetNativeWindow());
 }
 
 bool BrowserShortcutLauncherItemController::IsOpen() const {
   const BrowserList* ash_browser_list =
       BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
   for (BrowserList::const_iterator it = ash_browser_list->begin();
        it != ash_browser_list->end(); ++it) {
@@ skipping 224 matching lines @@
           web_app::GetExtensionIdFromApplicationName(browser->app_name())) > 0)
     return false;
 
   // Stand-alone chrome:// windows (e.g. settings) have their own icon.
   if (chrome::IsTrustedPopupWindowWithScheme(browser, content::kChromeUIScheme))
     return false;
 
   // Tabbed browser and other popup windows are all represented.
   return true;
 }