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

Side by Side Diff: ash/accelerators/accelerator_controller_unittest.cc

Issue 2047053002: Moves ash/accessibility_delegate into common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 years, 6 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 | « no previous file | ash/accelerators/spoken_feedback_toggler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/accelerators/accelerator_table.h" 7 #include "ash/accelerators/accelerator_table.h"
8 #include "ash/accessibility_delegate.h"
9 #include "ash/ash_switches.h" 8 #include "ash/ash_switches.h"
10 #include "ash/aura/wm_window_aura.h" 9 #include "ash/aura/wm_window_aura.h"
10 #include "ash/common/accessibility_delegate.h"
11 #include "ash/common/shell_window_ids.h" 11 #include "ash/common/shell_window_ids.h"
12 #include "ash/common/wm/panels/panel_layout_manager.h" 12 #include "ash/common/wm/panels/panel_layout_manager.h"
13 #include "ash/common/wm/window_positioning_utils.h" 13 #include "ash/common/wm/window_positioning_utils.h"
14 #include "ash/common/wm/window_state.h" 14 #include "ash/common/wm/window_state.h"
15 #include "ash/common/wm/wm_event.h" 15 #include "ash/common/wm/wm_event.h"
16 #include "ash/display/display_manager.h" 16 #include "ash/display/display_manager.h"
17 #include "ash/ime_control_delegate.h" 17 #include "ash/ime_control_delegate.h"
18 #include "ash/screen_util.h" 18 #include "ash/screen_util.h"
19 #include "ash/shell.h" 19 #include "ash/shell.h"
20 #include "ash/system/brightness_control_delegate.h" 20 #include "ash/system/brightness_control_delegate.h"
(...skipping 1557 matching lines...) Expand 10 before | Expand all | Expand 10 after
1578 EXPECT_TRUE(IsMessageCenterEmpty()); 1578 EXPECT_TRUE(IsMessageCenterEmpty());
1579 1579
1580 // If the action is LOCK_SCREEN, we must reset the state by unlocking the 1580 // If the action is LOCK_SCREEN, we must reset the state by unlocking the
1581 // screen before we proceed testing the rest of accelerators. 1581 // screen before we proceed testing the rest of accelerators.
1582 ResetStateIfNeeded(); 1582 ResetStateIfNeeded();
1583 } 1583 }
1584 } 1584 }
1585 #endif // defined(OS_CHROMEOS) 1585 #endif // defined(OS_CHROMEOS)
1586 1586
1587 } // namespace ash 1587 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/accelerators/spoken_feedback_toggler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698