chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc - Issue 2540433002: Reland "Propagate information about how ARC apps are launched"

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

Issue 2540433002: Reland "Propagate information about how ARC apps are launched" (Closed)

Patch Set: Moved mouse/touch detectors to ARC code Created 4 years, 1 month 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

« chrome/browser/ui/app_list/arc/arc_app_utils.cc ('K') | « chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/launcher_controller_helper.cc » ('j') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

index 92e680f251bd48334aa9992b2cbdced98e53ce10..be27ec6889bcc215db6cdcc8b8f5b74d1007272b 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

@@ -103,6 +103,7 @@

#include "ui/display/display.h"

#include "ui/display/display_switches.h"

#include "ui/display/screen.h"

+#include "ui/events/event_constants.h"

#include "ui/views/widget/widget.h"

using base::ASCIIToUTF16;

@@ -833,7 +834,7 @@ class ChromeLauncherControllerImplTest : public BrowserWithTestWindowTest {

}

// Creates app window and set optional Arc application id.

- views::Widget* CreateArcWindow(std::string& window_app_id) {

+ views::Widget* CreateArcWindow(const std::string& window_app_id) {

views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);

params.bounds = gfx::Rect(5, 5, 20, 20);

params.context = GetContext();

@@ -1788,11 +1789,11 @@ TEST_F(ChromeLauncherControllerImplWithArcTest, ArcDeferredLaunch) {

EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(arc_app_id2));

EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(arc_app_id3));

- arc::LaunchApp(profile(), arc_app_id1);

- arc::LaunchApp(profile(), arc_app_id2);

- arc::LaunchApp(profile(), arc_app_id3);

+ arc::LaunchApp(profile(), arc_app_id1, ui::EF_NONE);

+ arc::LaunchApp(profile(), arc_app_id2, ui::EF_NONE);

+ arc::LaunchApp(profile(), arc_app_id3, ui::EF_NONE);

const ash::ShelfID shelf_id_app_1 =

launcher_controller_->GetShelfIDForAppID(arc_app_id1);

@@ -3933,7 +3934,7 @@ TEST_F(ChromeLauncherControllerArcDefaultAppsTest, DefaultApps) {

const std::string app_id =

ArcAppTest::GetAppId(arc_test_.fake_default_apps()[0]);

EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(app_id));

- EXPECT_TRUE(arc::LaunchApp(profile(), app_id));

+ EXPECT_TRUE(arc::LaunchApp(profile(), app_id, ui::EF_NONE));

EXPECT_TRUE(arc_test_.arc_session_manager()->IsArcEnabled());

EXPECT_NE(0, launcher_controller_->GetShelfIDForAppID(app_id));

@@ -3941,7 +3942,7 @@ TEST_F(ChromeLauncherControllerArcDefaultAppsTest, DefaultApps) {

EnableArc(false);

EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(app_id));

- EXPECT_TRUE(arc::LaunchApp(profile(), app_id));

+ EXPECT_TRUE(arc::LaunchApp(profile(), app_id, ui::EF_NONE));

EXPECT_TRUE(arc_test_.arc_session_manager()->IsArcEnabled());

EXPECT_NE(0, launcher_controller_->GetShelfIDForAppID(app_id));