chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc - Issue 13007002: Create launcher app list for shell windows

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_browsertest.cc

Issue 13007002: Create launcher app list for shell windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 9 months 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

« no previous file with comments | « ash/launcher/launcher_view.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 be483c13a77512a08d7bbd5fb8509f6c6fc15d1b..c9f01fd25e81a0a5a171556d3ec33887be7544a7 100644

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

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

@@ -442,13 +442,12 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, WindowActivation) {

EXPECT_FALSE(ash::wm::IsActiveWindow(window2->GetNativeWindow()));

EXPECT_TRUE(ash::wm::IsActiveWindow(window1b->GetNativeWindow()));

- // Activate launcher item for app1, this will cycle the active window.

+ // Activate launcher item for app1, this will activate the first app window.

launcher_->ActivateLauncherItem(launcher_model()->ItemIndexByID(item_id1));

- EXPECT_FALSE(ash::wm::IsActiveWindow(window1b->GetNativeWindow()));

EXPECT_TRUE(ash::wm::IsActiveWindow(window1->GetNativeWindow()));

+ EXPECT_FALSE(ash::wm::IsActiveWindow(window1b->GetNativeWindow()));

launcher_->ActivateLauncherItem(launcher_model()->ItemIndexByID(item_id1));

- EXPECT_TRUE(ash::wm::IsActiveWindow(window1b->GetNativeWindow()));

- EXPECT_FALSE(ash::wm::IsActiveWindow(window1->GetNativeWindow()));

+ EXPECT_TRUE(ash::wm::IsActiveWindow(window1->GetNativeWindow()));

// Activate the second app again

launcher_->ActivateLauncherItem(launcher_model()->ItemIndexByID(item_id2));

@@ -458,9 +457,9 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, WindowActivation) {

// Activate the first app again

launcher_->ActivateLauncherItem(launcher_model()->ItemIndexByID(item_id1));

- EXPECT_FALSE(ash::wm::IsActiveWindow(window1->GetNativeWindow()));

+ EXPECT_TRUE(ash::wm::IsActiveWindow(window1->GetNativeWindow()));

EXPECT_FALSE(ash::wm::IsActiveWindow(window2->GetNativeWindow()));

- EXPECT_TRUE(ash::wm::IsActiveWindow(window1b->GetNativeWindow()));

+ EXPECT_FALSE(ash::wm::IsActiveWindow(window1b->GetNativeWindow()));

// Close second app.

CloseShellWindow(window2);

« no previous file with comments | « ash/launcher/launcher_view.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc » ('j') | no next file with comments »