chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc - Issue 2523053004: Enhance chrome.app.window API for shelf integration with restore support

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2523053004: Enhance chrome.app.window API for shelf integration with restore support (Closed)

Patch Set: 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

Download patch

« chrome/browser/ui/ash/launcher/chrome_launcher_controller.h ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc » ('j') | chrome/browser/ui/extensions/app_launch_params.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f4f0d6627aad0f104752d00253b47b39a0cab07d..dcc8e23e0a15d135f905c4d6b374beb84a093ad1 100644

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

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

@@ -937,9 +937,8 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, LaunchInBackground) {

LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_TAB,

WindowOpenDisposition::NEW_BACKGROUND_TAB);

EXPECT_EQ(++tab_count, tab_strip->count());

- controller_->LaunchApp(last_loaded_extension_id(),

- ash::LAUNCH_FROM_UNKNOWN,

- 0);

+ controller_->LaunchApp(last_loaded_extension_id(), "",

+ ash::LAUNCH_FROM_UNKNOWN, 0);

}

// Confirm that clicking a icon for an app running in one of 2 maxmized windows

@@ -992,9 +991,9 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, LaunchApp) {

const Extension* extension =

LoadExtension(test_data_dir_.AppendASCII("app1"));

- controller_->LaunchApp(extension->id(), ash::LAUNCH_FROM_UNKNOWN, 0);

+ controller_->LaunchApp(extension->id(), "", ash::LAUNCH_FROM_UNKNOWN, 0);

EXPECT_EQ(++tab_count, tab_strip->count());

- controller_->LaunchApp(extension->id(), ash::LAUNCH_FROM_UNKNOWN, 0);

+ controller_->LaunchApp(extension->id(), "", ash::LAUNCH_FROM_UNKNOWN, 0);

EXPECT_EQ(++tab_count, tab_strip->count());

}