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

Unified Diff: chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc

Issue 2540433002: Reland "Propagate information about how ARC apps are launched" (Closed)
Patch Set: Fixed use-after-free Created 4 years 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/ash/launcher/arc_app_launcher_browsertest.cc
diff --git a/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc b/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
index 576874ac79c1d74eb1b00f989adf1dd5df20b38b..cde7f22b3e16064bdc360f8d7f7fd70a9bcbd63c 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
@@ -19,6 +19,7 @@
#include "chromeos/chromeos_switches.h"
#include "content/public/test/browser_test_utils.h"
#include "mojo/common/common_type_converters.h"
+#include "ui/events/event_constants.h"
namespace mojo {
@@ -259,7 +260,7 @@ IN_PROC_BROWSER_TEST_P(ArcAppDeferredLauncherBrowserTest, StartAppDeferred) {
EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id));
// Launching non-ready Arc app creates item on shelf and spinning animation.
- arc::LaunchApp(profile(), app_id);
+ arc::LaunchApp(profile(), app_id, ui::EF_LEFT_MOUSE_BUTTON);
EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id));
AppAnimatedWaiter(app_id).Wait();
@@ -377,7 +378,7 @@ IN_PROC_BROWSER_TEST_F(ArcAppLauncherBrowserTest, IsAppOpen) {
AppListService* service = AppListService::Get();
AppListControllerDelegate* delegate = service->GetControllerDelegate();
EXPECT_FALSE(delegate->IsAppOpen(app_id));
- arc::LaunchApp(profile(), app_id);
+ arc::LaunchApp(profile(), app_id, ui::EF_LEFT_MOUSE_BUTTON);
EXPECT_FALSE(delegate->IsAppOpen(app_id));
// Simulate task creation so the app is marked as running/open.
std::unique_ptr<ArcAppListPrefs::AppInfo> info = app_prefs()->GetApp(app_id);

Powered by Google App Engine
This is Rietveld 408576698