Make launching apps from shelf more intuitive

chrome/browser/ui/extensions/app_launch_params.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/extensions/app_launch_params.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "ui/base/window_open_disposition.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/arc/arc_util.h"
 #include "components/arc/arc_util.h"
 #endif
 
 using extensions::ExtensionPrefs;
 using extensions::api::app_runtime::PlayStoreStatus;
 
 AppLaunchParams::AppLaunchParams(Profile* profile,
                                  const extensions::Extension* extension,
                                  extensions::LaunchContainer container,
                                  WindowOpenDisposition disposition,
                                  extensions::AppLaunchSource source,
-                                 bool set_playstore_status)
+                                 bool set_playstore_status,
+                                 const aura::Window* root_window)
     : profile(profile),
       extension_id(extension ? extension->id() : std::string()),
       container(container),
       disposition(disposition),
       command_line(base::CommandLine::NO_PROGRAM),
       source(source),
-      play_store_status(PlayStoreStatus::PLAY_STORE_STATUS_UNKNOWN) {
+      play_store_status(PlayStoreStatus::PLAY_STORE_STATUS_UNKNOWN),
+      root_window(root_window) {
 #if defined(OS_CHROMEOS)
   // TODO(b/34478891): Remove this from app launch.
   if (set_playstore_status) {
     if (arc::IsArcAllowedForProfile(profile))
       play_store_status = PlayStoreStatus::PLAY_STORE_STATUS_ENABLED;
     else if (arc::IsArcAvailable())
       play_store_status = PlayStoreStatus::PLAY_STORE_STATUS_AVAILABLE;
     // else, default to PLAY_STORE_STATUS_UNKNOWN.
   }
 #endif
@@ skipping 12 matching lines @@
   // is to launch as a regular tab.
   extensions::LaunchContainer container =
       extensions::GetLaunchContainer(ExtensionPrefs::Get(profile), extension);
   return AppLaunchParams(profile, extension, container, disposition, source);
 }
 
 AppLaunchParams CreateAppLaunchParamsWithEventFlags(
     Profile* profile,
     const extensions::Extension* extension,
     int event_flags,
-    extensions::AppLaunchSource source) {
+    extensions::AppLaunchSource source,
+    const aura::Window* root_window) {
   WindowOpenDisposition raw_disposition =
       ui::DispositionFromEventFlags(event_flags);
 
   extensions::LaunchContainer container;
   WindowOpenDisposition disposition;
   if (raw_disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB ||
       raw_disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB) {
     container = extensions::LAUNCH_CONTAINER_TAB;
     disposition = raw_disposition;
   } else if (raw_disposition == WindowOpenDisposition::NEW_WINDOW) {
     container = extensions::LAUNCH_CONTAINER_WINDOW;
     disposition = raw_disposition;
   } else {
     // Look at preference to find the right launch container.  If no preference
     // is set, launch as a regular tab.
     container =
         extensions::GetLaunchContainer(ExtensionPrefs::Get(profile), extension);
     disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
   }
-  return AppLaunchParams(profile, extension, container, disposition, source);
+  return AppLaunchParams(profile, extension, container, disposition, source,
+                         false, root_window);
 }