Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(326)

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

Issue 1890713002: Adds WmWindow and converts WindowState to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge again Created 4 years, 8 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
OLDNEW
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/window_state.h"
9 #include "ash/wm/window_state_aura.h"
9 #include "build/build_config.h" 10 #include "build/build_config.h"
10 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/browser_window.h" 12 #include "chrome/browser/ui/browser_window.h"
12 #include "chrome/test/base/in_process_browser_test.h" 13 #include "chrome/test/base/in_process_browser_test.h"
13 #include "ui/events/test/event_generator.h" 14 #include "ui/events/test/event_generator.h"
14 15
15 #if defined(USE_X11) 16 #if defined(USE_X11)
16 #include "ui/events/test/events_test_utils_x11.h" 17 #include "ui/events/test/events_test_utils_x11.h"
17 #endif 18 #endif
18 19
(...skipping 23 matching lines...) Expand all
42 ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow()); 43 ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());
43 generator.PressKey(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN); 44 generator.PressKey(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN);
44 EXPECT_TRUE(window_state->IsMaximized()); 45 EXPECT_TRUE(window_state->IsMaximized());
45 46
46 generator.PressKey(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN); 47 generator.PressKey(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN);
47 48
48 generator.ReleaseKey(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN); 49 generator.ReleaseKey(ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN);
49 EXPECT_TRUE(window_state->IsMaximized()); 50 EXPECT_TRUE(window_state->IsMaximized());
50 } 51 }
51 #endif 52 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698