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

Side by Side Diff: ash/focus_cycler_unittest.cc

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: cleanup Created 3 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
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/focus_cycler.h" 5 #include "ash/focus_cycler.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/shelf/shelf.h"
9 #include "ash/shelf/shelf_widget.h" 10 #include "ash/shelf/shelf_widget.h"
10 #include "ash/shelf/wm_shelf.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/system/status_area_widget.h" 12 #include "ash/system/status_area_widget.h"
13 #include "ash/system/status_area_widget_delegate.h" 13 #include "ash/system/status_area_widget_delegate.h"
14 #include "ash/system/tray/system_tray.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/wm/window_util.h" 16 #include "ash/wm/window_util.h"
17 #include "ui/aura/test/test_windows.h" 17 #include "ui/aura/test/test_windows.h"
18 #include "ui/aura/window.h" 18 #include "ui/aura/window.h"
19 #include "ui/aura/window_event_dispatcher.h" 19 #include "ui/aura/window_event_dispatcher.h"
20 #include "ui/events/test/event_generator.h" 20 #include "ui/events/test/event_generator.h"
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 // Cycle focus to the shelf. 397 // Cycle focus to the shelf.
398 Shell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD); 398 Shell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
399 399
400 // Cycle focus should go back to the browser. 400 // Cycle focus should go back to the browser.
401 Shell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD); 401 Shell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
402 EXPECT_TRUE(wm::IsActiveWindow(window.get())); 402 EXPECT_TRUE(wm::IsActiveWindow(window.get()));
403 } 403 }
404 404
405 } // namespace test 405 } // namespace test
406 } // namespace ash 406 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698