App windows launched in windows ASH should not be messing with the AppUserModelId for the remote HW…

chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc

 // Copyright 2014 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/apps/chrome_native_app_window_views_win.h"
 
 #include "apps/ui/views/app_window_frame_view.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 90 matching lines @@
   if (desktop_type == chrome::HOST_DESKTOP_TYPE_ASH)
     init_params->context = ash::Shell::GetPrimaryRootWindow();
   else
     init_params->native_widget = new AppWindowDesktopNativeWidgetAuraWin(this);
 }
 
 void ChromeNativeAppWindowViewsWin::InitializeDefaultWindow(
     const extensions::AppWindow::CreateParams& create_params) {
   ChromeNativeAppWindowViews::InitializeDefaultWindow(create_params);
 
+  // Remaining initialization is for Windows shell integration, which doesn't
+  // apply to app windows in Ash.
+  if (IsRunningInAsh())
+    return;
+
   const extensions::Extension* extension = app_window()->GetExtension();
   if (!extension)
     return;
 
   std::string app_name =
       web_app::GenerateApplicationNameFromExtensionId(extension->id());
   base::string16 app_name_wide = base::UTF8ToWide(app_name);
   HWND hwnd = GetNativeAppWindowHWND();
   Profile* profile =
       Profile::FromBrowserContext(app_window()->browser_context());
   app_model_id_ =
       ShellIntegration::GetAppModelIdForProfile(app_name_wide,
                                                 profile->GetPath());
   ui::win::SetAppIdForWindow(app_model_id_, hwnd);
-
   web_app::UpdateRelaunchDetailsForApp(profile, extension, hwnd);
 
-  if (!create_params.alpha_enabled && !IsRunningInAsh())
+  if (!create_params.alpha_enabled)
     EnsureCaptionStyleSet();
   UpdateShelfMenu();
 }
 
 views::NonClientFrameView*
 ChromeNativeAppWindowViewsWin::CreateStandardDesktopAppFrame() {
   glass_frame_view_ = NULL;
   if (ui::win::IsAeroGlassEnabled()) {
     glass_frame_view_ = new GlassAppWindowFrameViewWin(this, widget());
     return glass_frame_view_;
   }
   return ChromeNativeAppWindowViews::CreateStandardDesktopAppFrame();
 }
 
 void ChromeNativeAppWindowViewsWin::Show() {
   ActivateParentDesktopIfNecessary();
   ChromeNativeAppWindowViews::Show();
 }
 
 void ChromeNativeAppWindowViewsWin::Activate() {
   ActivateParentDesktopIfNecessary();
   ChromeNativeAppWindowViews::Activate();
 }
 
 void ChromeNativeAppWindowViewsWin::UpdateShelfMenu() {
-  if (!JumpListUpdater::IsEnabled())
+  if (!JumpListUpdater::IsEnabled() || IsRunningInAsh())
     return;
 
   // Currently the only option is related to ephemeral apps, so avoid updating
   // the app's jump list when the feature is not enabled.
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableEphemeralApps)) {
     return;
   }
 
   const extensions::Extension* extension = app_window()->GetExtension();
   if (!extension)
     return;
 
   // For the icon resources.
   base::FilePath chrome_path;
   if (!PathService::Get(base::FILE_EXE, &chrome_path))
     return;
 
+  DCHECK(!app_model_id_.empty());
+
   JumpListUpdater jumplist_updater(app_model_id_);
   if (!jumplist_updater.BeginUpdate())
     return;
 
   // Add item to install ephemeral apps.
   if (extensions::util::IsEphemeralApp(extension->id(),
                                        app_window()->browser_context())) {
     scoped_refptr<ShellLinkItem> link(new ShellLinkItem());
     link->set_title(l10n_util::GetStringUTF16(IDS_APP_INSTALL_TITLE));
     link->set_icon(chrome_path.value(),
                    icon_resources::kInstallPackagedAppIndex);
     ShellIntegration::AppendProfileArgs(
         app_window()->browser_context()->GetPath(), link->GetCommandLine());
     link->GetCommandLine()->AppendSwitchASCII(switches::kInstallFromWebstore,
                                               extension->id());
 
     ShellLinkItemList items;
     items.push_back(link);
     jumplist_updater.AddTasks(items);
   }
 
   // Note that an empty jumplist must still be committed to clear all items.
   jumplist_updater.CommitUpdate();
 }