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

Side by Side Diff: ash/content/keyboard_overlay/keyboard_overlay_delegate_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/app_list/app_list_presenter_delegate.cc ('k') | ash/dip_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/content/keyboard_overlay/keyboard_overlay_delegate.h" 5 #include "ash/content/keyboard_overlay/keyboard_overlay_delegate.h"
6 6
7 #include "ash/public/cpp/shelf_types.h" 7 #include "ash/public/cpp/shelf_types.h"
8 #include "ash/shelf/wm_shelf.h" 8 #include "ash/shelf/shelf.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 #include "ui/display/display.h" 13 #include "ui/display/display.h"
14 #include "ui/display/screen.h" 14 #include "ui/display/screen.h"
15 #include "ui/views/widget/widget.h" 15 #include "ui/views/widget/widget.h"
16 16
17 namespace ash { 17 namespace ash {
18 18
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 58
59 // Tests run four times - for all possible values of shelf alignment 59 // Tests run four times - for all possible values of shelf alignment
60 INSTANTIATE_TEST_CASE_P(ShelfAlignmentAny, 60 INSTANTIATE_TEST_CASE_P(ShelfAlignmentAny,
61 KeyboardOverlayDelegateTest, 61 KeyboardOverlayDelegateTest,
62 testing::Values(SHELF_ALIGNMENT_BOTTOM, 62 testing::Values(SHELF_ALIGNMENT_BOTTOM,
63 SHELF_ALIGNMENT_LEFT, 63 SHELF_ALIGNMENT_LEFT,
64 SHELF_ALIGNMENT_RIGHT, 64 SHELF_ALIGNMENT_RIGHT,
65 SHELF_ALIGNMENT_BOTTOM_LOCKED)); 65 SHELF_ALIGNMENT_BOTTOM_LOCKED));
66 66
67 } // namespace ash 67 } // namespace ash
OLDNEW
« no previous file with comments | « ash/app_list/app_list_presenter_delegate.cc ('k') | ash/dip_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698