chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc - Issue 2169533002: mash: Migrate shelf app list button to wm common types

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/chromeos/accessibility/sticky_keys_browsertest.cc

Issue 2169533002: mash: Migrate shelf app list button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 5 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/wm/window_cycle_controller_unittest.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc

diff --git a/chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc b/chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc

index 28a94b12dfbf53a5818d4acc722b5ff14a4836c7..953590c2fd05e7c197076eb09ddb683fde8e4c57 100644

--- a/chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc

+++ b/chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc

@@ -5,6 +5,7 @@

#include <stddef.h>

#include "ash/common/system/tray/system_tray.h"

+#include "ash/common/wm_shell.h"

#include "ash/shell.h"

#include "ash/sticky_keys/sticky_keys_controller.h"

#include "ash/sticky_keys/sticky_keys_overlay.h"

@@ -160,7 +161,7 @@ IN_PROC_BROWSER_TEST_F(StickyKeysBrowserTest, SearchLeftOmnibox) {

// Make sure that the AppList is not erronously displayed and the omnibox

// doesn't lost focus

- EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());

+ EXPECT_FALSE(ash::WmShell::Get()->GetAppListTargetVisibility());

EXPECT_TRUE(omnibox->GetNativeView()->HasFocus());

// Type 'foo'.

@@ -174,14 +175,14 @@ IN_PROC_BROWSER_TEST_F(StickyKeysBrowserTest, SearchLeftOmnibox) {

ASSERT_EQ(3U, start);

ASSERT_EQ(3U, end);

- EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());

+ EXPECT_FALSE(ash::WmShell::Get()->GetAppListTargetVisibility());

EXPECT_TRUE(omnibox->GetNativeView()->HasFocus());

// Hit Home by sequencing Search (left Windows) and Left (arrow).

SendKeyPress(ui::VKEY_LWIN);

SendKeyPress(ui::VKEY_LEFT);

- EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());

+ EXPECT_FALSE(ash::WmShell::Get()->GetAppListTargetVisibility());

EXPECT_TRUE(omnibox->GetNativeView()->HasFocus());

// Verify caret moved to the beginning.