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

Unified Diff: chrome/browser/ui/extensions/application_launch.cc

Issue 1685883003: Remove HostDesktopType from AppLaunchParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-15
Patch Set: cros Created 4 years, 10 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
Index: chrome/browser/ui/extensions/application_launch.cc
diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc
index 8c7fa3fb16c6ff980255ee56531ba54d979aac6a..5412a4b16ea60aca9a61fde6b010301336f25bed 100644
--- a/chrome/browser/ui/extensions/application_launch.cc
+++ b/chrome/browser/ui/extensions/application_launch.cc
@@ -56,9 +56,9 @@ using extensions::ExtensionRegistry;
namespace {
// Shows the app list for |desktop_type| and returns the app list's window.
-gfx::NativeWindow ShowAppListAndGetNativeWindow(
- chrome::HostDesktopType desktop_type) {
- AppListService* app_list_service = AppListService::Get(desktop_type);
+gfx::NativeWindow ShowAppListAndGetNativeWindow() {
+ AppListService* app_list_service =
+ AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE);
app_list_service->Show();
return app_list_service->GetAppListWindow();
}
@@ -383,8 +383,7 @@ void OpenApplicationWithReenablePrompt(const AppLaunchParams& params) {
base::Callback<gfx::NativeWindow(void)> dialog_parent_window_getter;
// TODO(pkotwicz): Figure out which window should be used as the parent for
// the "enable application" dialog in Athena.
- dialog_parent_window_getter =
- base::Bind(&ShowAppListAndGetNativeWindow, params.desktop_type);
+ dialog_parent_window_getter = base::Bind(&ShowAppListAndGetNativeWindow);
(new EnableViaDialogFlow(
service, profile, extension->id(), dialog_parent_window_getter,
base::Bind(base::IgnoreResult(OpenEnabledApplication), params)))->Run();
« no previous file with comments | « chrome/browser/ui/extensions/app_launch_params.cc ('k') | chrome/browser/ui/startup/startup_browser_creator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698