From 99230da5e39ce56f28f05a515941fae53ba5eded Mon Sep 17 00:00:00 2001 From: scottmg Date: Wed, 10 Feb 2016 17:00:49 -0800 Subject: Remove HostDesktopType from AppLaunchParams R=sky@chromium.org, benwells@chromium.org BUG=558054 Review URL: https://codereview.chromium.org/1685883003 Cr-Commit-Position: refs/heads/master@{#374814} --- chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc | 6 +++--- .../ui/ash/launcher/chrome_launcher_controller_browsertest.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'chrome/browser/ui/ash/launcher') diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc index dd9c48e..61adb3f 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc @@ -780,9 +780,9 @@ void ChromeLauncherController::LaunchApp(const std::string& app_id, } // The app will be created for the currently active profile. - AppLaunchParams params( - profile_, extension, ui::DispositionFromEventFlags(event_flags), - chrome::HOST_DESKTOP_TYPE_ASH, extensions::SOURCE_APP_LAUNCHER); + AppLaunchParams params(profile_, extension, + ui::DispositionFromEventFlags(event_flags), + extensions::SOURCE_APP_LAUNCHER); if (source != ash::LAUNCH_FROM_UNKNOWN && app_id == extensions::kWebStoreAppId) { // Get the corresponding source string. diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc index d6fbec0..049b6a5 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc @@ -2136,7 +2136,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, V1AppNavigation) { // Create a windowed application. AppLaunchParams params( profile(), controller_->GetExtensionForAppID(extensions::kWebStoreAppId), - CURRENT_TAB, chrome::HOST_DESKTOP_TYPE_ASH, extensions::SOURCE_TEST); + CURRENT_TAB, extensions::SOURCE_TEST); params.container = extensions::LAUNCH_CONTAINER_WINDOW; OpenApplication(params); EXPECT_EQ(ash::STATUS_ACTIVE, model_->ItemByID(id)->status); -- cgit v1.1