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

Side by Side Diff: ash/focus_cycler_unittest.cc

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay
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 unified diff | Download patch
« no previous file with comments | « ash/first_run/first_run_helper_impl.cc ('k') | ash/root_window_controller.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/common/focus_cycler.h" 5 #include "ash/common/focus_cycler.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/common/system/status_area_widget.h"
9 #include "ash/common/system/status_area_widget_delegate.h" 10 #include "ash/common/system/status_area_widget_delegate.h"
11 #include "ash/common/system/tray/system_tray.h"
10 #include "ash/common/wm_shell.h" 12 #include "ash/common/wm_shell.h"
11 #include "ash/shelf/shelf.h" 13 #include "ash/shelf/shelf.h"
12 #include "ash/shelf/shelf_widget.h" 14 #include "ash/shelf/shelf_widget.h"
13 #include "ash/system/status_area_widget.h"
14 #include "ash/system/tray/system_tray.h"
15 #include "ash/test/ash_test_base.h" 15 #include "ash/test/ash_test_base.h"
16 #include "ash/test/status_area_widget_test_helper.h" 16 #include "ash/test/status_area_widget_test_helper.h"
17 #include "ash/wm/window_util.h" 17 #include "ash/wm/window_util.h"
18 #include "ui/aura/test/test_windows.h" 18 #include "ui/aura/test/test_windows.h"
19 #include "ui/aura/window.h" 19 #include "ui/aura/window.h"
20 #include "ui/aura/window_event_dispatcher.h" 20 #include "ui/aura/window_event_dispatcher.h"
21 #include "ui/events/test/event_generator.h" 21 #include "ui/events/test/event_generator.h"
22 #include "ui/views/accessible_pane_view.h" 22 #include "ui/views/accessible_pane_view.h"
23 #include "ui/views/controls/button/menu_button.h" 23 #include "ui/views/controls/button/menu_button.h"
24 #include "ui/views/widget/widget.h" 24 #include "ui/views/widget/widget.h"
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 // Cycle focus to the shelf. 408 // Cycle focus to the shelf.
409 WmShell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD); 409 WmShell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
410 410
411 // Cycle focus should go back to the browser. 411 // Cycle focus should go back to the browser.
412 WmShell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD); 412 WmShell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
413 EXPECT_TRUE(wm::IsActiveWindow(window.get())); 413 EXPECT_TRUE(wm::IsActiveWindow(window.get()));
414 } 414 }
415 415
416 } // namespace test 416 } // namespace test
417 } // namespace ash 417 } // namespace ash
OLDNEW
« no previous file with comments | « ash/first_run/first_run_helper_impl.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698