chrome/browser/ui/ash/accelerator_controller_browsertest.cc - Issue 1921353002: Moves handful of files to ash/wm/common

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/ash/accelerator_controller_browsertest.cc

Issue 1921353002: Moves handful of files to ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shell_ids

Patch Set: merge to trunk Created 4 years, 7 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 unified diff | Download patch

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

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ash/accelerators/accelerator_controller.h"	5 #include "ash/accelerators/accelerator_controller.h"

6	6

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/wm/window_state.h"	8 #include "ash/wm/common/window_state.h"

9 #include "ash/wm/window_state_aura.h"	9 #include "ash/wm/window_state_aura.h"

10 #include "build/build_config.h"	10 #include "build/build_config.h"

11 #include "chrome/browser/ui/browser.h"	11 #include "chrome/browser/ui/browser.h"

12 #include "chrome/browser/ui/browser_window.h"	12 #include "chrome/browser/ui/browser_window.h"

13 #include "chrome/test/base/in_process_browser_test.h"	13 #include "chrome/test/base/in_process_browser_test.h"

14 #include "ui/events/test/event_generator.h"	14 #include "ui/events/test/event_generator.h"

15	15

16 #if defined(USE_X11)	16 #if defined(USE_X11)

17 #include "ui/events/test/events_test_utils_x11.h"	17 #include "ui/events/test/events_test_utils_x11.h"

18 #endif	18 #endif

(...skipping 24 matching lines...) Expand all Loading...
43 ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());	43 ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());

44 generator.PressKey(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN);	44 generator.PressKey(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN);

45 EXPECT_TRUE(window_state->IsMaximized());	45 EXPECT_TRUE(window_state->IsMaximized());

46	46

47 generator.PressKey(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN);	47 generator.PressKey(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN);

48	48

49 generator.ReleaseKey(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN);	49 generator.ReleaseKey(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN);

50 EXPECT_TRUE(window_state->IsMaximized());	50 EXPECT_TRUE(window_state->IsMaximized());

51 }	51 }

52 #endif	52 #endif

OLD	NEW