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

Side by Side Diff: ash/wm/dock/docked_window_layout_manager_unittest.cc

Issue 71653003: ash: Rename LauncherModel to ShelfModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome changes Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | ash/wm/dock/docked_window_resizer_unittest.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/dock/docked_window_layout_manager.h" 5 #include "ash/wm/dock/docked_window_layout_manager.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/launcher/launcher.h" 8 #include "ash/launcher/launcher.h"
9 #include "ash/launcher/launcher_model.h"
10 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
11 #include "ash/screen_ash.h" 10 #include "ash/screen_ash.h"
12 #include "ash/shelf/shelf_layout_manager.h" 11 #include "ash/shelf/shelf_layout_manager.h"
12 #include "ash/shelf/shelf_model.h"
13 #include "ash/shelf/shelf_types.h" 13 #include "ash/shelf/shelf_types.h"
14 #include "ash/shelf/shelf_widget.h" 14 #include "ash/shelf/shelf_widget.h"
15 #include "ash/shell.h" 15 #include "ash/shell.h"
16 #include "ash/shell_window_ids.h" 16 #include "ash/shell_window_ids.h"
17 #include "ash/test/ash_test_base.h" 17 #include "ash/test/ash_test_base.h"
18 #include "ash/test/launcher_test_api.h" 18 #include "ash/test/launcher_test_api.h"
19 #include "ash/test/shelf_view_test_api.h" 19 #include "ash/test/shelf_view_test_api.h"
20 #include "ash/test/shell_test_api.h" 20 #include "ash/test/shell_test_api.h"
21 #include "ash/test/test_launcher_delegate.h" 21 #include "ash/test/test_launcher_delegate.h"
22 #include "ash/wm/coordinate_conversion.h" 22 #include "ash/wm/coordinate_conversion.h"
(...skipping 785 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 EXPECT_LT(w2->GetBoundsInScreen().height(), work_area.height() / 2 - 10); 808 EXPECT_LT(w2->GetBoundsInScreen().height(), work_area.height() / 2 - 10);
809 } 809 }
810 810
811 // Tests run twice - on both panels and normal windows 811 // Tests run twice - on both panels and normal windows
812 INSTANTIATE_TEST_CASE_P(NormalOrPanel, 812 INSTANTIATE_TEST_CASE_P(NormalOrPanel,
813 DockedWindowLayoutManagerTest, 813 DockedWindowLayoutManagerTest,
814 testing::Values(aura::client::WINDOW_TYPE_NORMAL, 814 testing::Values(aura::client::WINDOW_TYPE_NORMAL,
815 aura::client::WINDOW_TYPE_PANEL)); 815 aura::client::WINDOW_TYPE_PANEL));
816 } // namespace internal 816 } // namespace internal
817 } // namespace ash 817 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | ash/wm/dock/docked_window_resizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698