ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc - Issue 2272793005: ash: Move alignment and autohide behavior from Shelf to WmShelf

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: ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc

Issue 2272793005: ash: Move alignment and autohide behavior from Shelf to WmShelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: tweaks Created 4 years, 4 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

« ash/common/shelf/wm_shelf.cc ('K') | « ash/common/shelf/wm_shelf.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc

diff --git a/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc b/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc

index 5fdac7e331aa97f2dac3ff7f4bcac0f814bc8cf8..ae88878edabe124b0499a71e5fb67f85189a09ab 100644

--- a/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc

+++ b/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc

@@ -4,8 +4,8 @@

#include "ash/content/keyboard_overlay/keyboard_overlay_delegate.h"

-#include "ash/common/shelf/shelf.h"

#include "ash/common/shelf/shelf_types.h"

+#include "ash/common/shelf/wm_shelf.h"

#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

#include "base/strings/utf_string_conversions.h"

@@ -36,7 +36,7 @@ TEST_P(KeyboardOverlayDelegateTest, ShowAndClose) {

return;

UpdateDisplay("500x400,300x200");

- Shelf::ForPrimaryDisplay()->SetAlignment(shelf_alignment());

+ GetPrimaryShelf()->SetAlignment(shelf_alignment());

KeyboardOverlayDelegate delegate(base::ASCIIToUTF16("Title"),

GURL("chrome://keyboardoverlay/"));

// Showing the dialog creates a widget.