Make launching apps from shelf more intuitive

chrome/browser/ui/extensions/app_launch_params.h

Index: chrome/browser/ui/extensions/app_launch_params.h
diff --git a/chrome/browser/ui/extensions/app_launch_params.h b/chrome/browser/ui/extensions/app_launch_params.h
index 8ca55e2b2ec56b502584e128163ce2172cf72dfe..b81ebe19fcc16eca2e5a6ab8608472fecf223cd1 100644
--- a/chrome/browser/ui/extensions/app_launch_params.h
+++ b/chrome/browser/ui/extensions/app_launch_params.h
@@ -13,6 +13,7 @@
 #include "extensions/common/api/app_runtime.h"
 #include "extensions/common/constants.h"
 #include "ui/base/window_open_disposition.h"
+#include "ui/display/types/display_constants.h"
 #include "ui/gfx/geometry/rect.h"
 #include "url/gurl.h"
 
@@ -28,7 +29,8 @@ struct AppLaunchParams {
                   extensions::LaunchContainer container,
                   WindowOpenDisposition disposition,
                   extensions::AppLaunchSource source,
-                  bool set_playstore_status = false);
+                  bool set_playstore_status = false,
+                  int64_t display_id = display::kInvalidDisplayId);
 
   AppLaunchParams(const AppLaunchParams& other);
 
@@ -71,6 +73,11 @@ struct AppLaunchParams {
 
   // Status of ARC on this device.
   extensions::api::app_runtime::PlayStoreStatus play_store_status;
+
+  // The id of the display from which the app is launched.
+  // display::kInvalidDisplayId means that the display does not exist or is not
+  // set.
+  int64_t display_id;
 };
 
 // Helper to create AppLaunchParams using extensions::GetLaunchContainer with
@@ -83,11 +90,13 @@ AppLaunchParams CreateAppLaunchParamsUserContainer(
 
 // Helper to create AppLaunchParams using event flags that allows user to
 // override the user-configured container using modifier keys, falling back to
-// extensions::GetLaunchContainer() with no modifiers.
+// extensions::GetLaunchContainer() with no modifiers. |display_id| is the id of
+// the display from which the app is launched.
 AppLaunchParams CreateAppLaunchParamsWithEventFlags(
     Profile* profile,
     const extensions::Extension* extension,
     int event_flags,
-    extensions::AppLaunchSource source);
+    extensions::AppLaunchSource source,
+    int64_t display_id);
 
 #endif  // CHROME_BROWSER_UI_EXTENSIONS_APP_LAUNCH_PARAMS_H_