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

Side by Side Diff: ash/wm/window_cycle_controller_unittest.cc

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase 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
« no previous file with comments | « ash/wm/window_animations.cc ('k') | ash/wm/window_util.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 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/wm/window_cycle_controller.h" 5 #include "ash/wm/window_cycle_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/focus_cycler.h" 10 #include "ash/focus_cycler.h"
11 #include "ash/public/cpp/config.h" 11 #include "ash/public/cpp/config.h"
12 #include "ash/public/cpp/shell_window_ids.h" 12 #include "ash/public/cpp/shell_window_ids.h"
13 #include "ash/scoped_root_window_for_new_windows.h" 13 #include "ash/scoped_root_window_for_new_windows.h"
14 #include "ash/session/session_controller.h" 14 #include "ash/session/session_controller.h"
15 #include "ash/shelf/shelf.h"
15 #include "ash/shelf/shelf_widget.h" 16 #include "ash/shelf/shelf_widget.h"
16 #include "ash/shelf/wm_shelf.h"
17 #include "ash/shell.h" 17 #include "ash/shell.h"
18 #include "ash/test/ash_test_base.h" 18 #include "ash/test/ash_test_base.h"
19 #include "ash/test/shelf_view_test_api.h" 19 #include "ash/test/shelf_view_test_api.h"
20 #include "ash/test/test_app_list_view_presenter_impl.h" 20 #include "ash/test/test_app_list_view_presenter_impl.h"
21 #include "ash/test/test_session_controller_client.h" 21 #include "ash/test/test_session_controller_client.h"
22 #include "ash/test/test_shell_delegate.h" 22 #include "ash/test/test_shell_delegate.h"
23 #include "ash/wm/window_cycle_list.h" 23 #include "ash/wm/window_cycle_list.h"
24 #include "ash/wm/window_state.h" 24 #include "ash/wm/window_state.h"
25 #include "ash/wm/window_util.h" 25 #include "ash/wm/window_util.h"
26 #include "ash/wm/wm_event.h" 26 #include "ash/wm/wm_event.h"
(...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 // Base case sets the expectation for other cases. 759 // Base case sets the expectation for other cases.
760 if (expected_bounds.IsEmpty()) 760 if (expected_bounds.IsEmpty())
761 expected_bounds = display_relative_bounds; 761 expected_bounds = display_relative_bounds;
762 else 762 else
763 EXPECT_EQ(expected_bounds, display_relative_bounds); 763 EXPECT_EQ(expected_bounds, display_relative_bounds);
764 controller->CompleteCycling(); 764 controller->CompleteCycling();
765 } 765 }
766 } 766 }
767 767
768 } // namespace ash 768 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/window_animations.cc ('k') | ash/wm/window_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698