Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Unified Diff: chrome/browser/ui/extensions/app_launch_params.h

Issue 1807743003: Remove HostDesktopType from AppLaunchParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@temp-parent
Patch Set: cros Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/chrome_pages.cc ('k') | chrome/browser/ui/extensions/app_launch_params.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c95cc5a1cae097c93808762e317092ca73414836..0aeabbabfce88c1187783de5646de0fd644564d6 100644
--- a/chrome/browser/ui/extensions/app_launch_params.h
+++ b/chrome/browser/ui/extensions/app_launch_params.h
@@ -9,7 +9,6 @@
#include "base/command_line.h"
#include "base/files/file_path.h"
-#include "chrome/browser/ui/host_desktop.h"
#include "chrome/common/extensions/extension_constants.h"
#include "extensions/common/constants.h"
#include "ui/base/window_open_disposition.h"
@@ -29,23 +28,6 @@ struct AppLaunchParams {
WindowOpenDisposition disposition,
extensions::AppLaunchSource source);
- // Helper to create AppLaunchParams using extensions::GetLaunchContainer with
- // LAUNCH_TYPE_REGULAR to check for a user-configured container.
- AppLaunchParams(Profile* profile,
- const extensions::Extension* extension,
- WindowOpenDisposition disposition,
- extensions::AppLaunchSource source);
-
- // 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. |desktop_type|
- // indicates the desktop upon which to launch (Ash or Native).
- AppLaunchParams(Profile* profile,
- const extensions::Extension* extension,
- WindowOpenDisposition disposition,
- chrome::HostDesktopType desktop_type,
- extensions::AppLaunchSource source);
-
AppLaunchParams(const AppLaunchParams& other);
~AppLaunchParams();
@@ -62,9 +44,6 @@ struct AppLaunchParams {
// If container is TAB, this field controls how the tab is opened.
WindowOpenDisposition disposition;
- // The desktop type to launch on. Uses GetActiveDesktop() if unspecified.
- chrome::HostDesktopType desktop_type;
-
// If non-empty, use override_url in place of the application's launch url.
GURL override_url;
@@ -85,4 +64,21 @@ struct AppLaunchParams {
extensions::AppLaunchSource source;
};
+// Helper to create AppLaunchParams using extensions::GetLaunchContainer with
+// LAUNCH_TYPE_REGULAR to check for a user-configured container.
+AppLaunchParams CreateAppLaunchParamsUserContainer(
+ Profile* profile,
+ const extensions::Extension* extension,
+ WindowOpenDisposition disposition,
+ extensions::AppLaunchSource source);
+
+// 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.
+AppLaunchParams CreateAppLaunchParamsWithEventFlags(
+ Profile* profile,
+ const extensions::Extension* extension,
+ int event_flags,
+ extensions::AppLaunchSource source);
+
#endif // CHROME_BROWSER_UI_EXTENSIONS_APP_LAUNCH_PARAMS_H_
« no previous file with comments | « chrome/browser/ui/chrome_pages.cc ('k') | chrome/browser/ui/extensions/app_launch_params.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698