| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
|
| 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 fa4e1676621754afdc2b304beda5dbedbcdc406e..cd53877ca532c87cd973eaca2903aa552a889d6b 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
|
| @@ -38,7 +38,6 @@
|
| #include "chrome/browser/ui/browser_list.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "chrome/browser/ui/chrome_pages.h"
|
| -#include "chrome/browser/ui/extensions/app_launch_params.h"
|
| #include "chrome/browser/ui/extensions/application_launch.h"
|
| #include "chrome/browser/ui/host_desktop.h"
|
| #include "chrome/browser/ui/settings_window_manager.h"
|
| @@ -61,7 +60,6 @@
|
| #include "ui/app_list/views/apps_grid_view.h"
|
| #include "ui/aura/client/aura_constants.h"
|
| #include "ui/aura/window.h"
|
| -#include "ui/base/window_open_disposition.h"
|
| #include "ui/events/event.h"
|
| #include "ui/events/test/event_generator.h"
|
|
|
| @@ -222,8 +220,10 @@ class ShelfAppBrowserTest : public ExtensionBrowserTest {
|
| service->GetExtensionById(last_loaded_extension_id(), false);
|
| EXPECT_TRUE(extension);
|
|
|
| - OpenApplication(AppLaunchParams(profile(), extension, container,
|
| - disposition, extensions::SOURCE_UNTRACKED));
|
| + OpenApplication(AppLaunchParams(profile(),
|
| + extension,
|
| + container,
|
| + disposition));
|
| return extension;
|
| }
|
|
|
| @@ -2078,8 +2078,10 @@ 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_UNTRACKED);
|
| + profile(),
|
| + controller_->GetExtensionForAppID(extensions::kWebStoreAppId),
|
| + 0,
|
| + chrome::HOST_DESKTOP_TYPE_ASH);
|
| params.container = extensions::LAUNCH_CONTAINER_WINDOW;
|
| OpenApplication(params);
|
| EXPECT_EQ(ash::STATUS_ACTIVE, model_->ItemByID(id)->status);
|
|
|