OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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/system/chromeos/tray_display.h" | 5 #include "ash/system/chromeos/tray_display.h" |
6 | 6 |
7 #include "ash/common/system/chromeos/devicetype_utils.h" | 7 #include "ash/common/system/chromeos/devicetype_utils.h" |
| 8 #include "ash/common/system/tray/system_tray.h" |
8 #include "ash/display/display_manager.h" | 9 #include "ash/display/display_manager.h" |
9 #include "ash/screen_util.h" | 10 #include "ash/screen_util.h" |
10 #include "ash/shell.h" | 11 #include "ash/shell.h" |
11 #include "ash/system/tray/system_tray.h" | |
12 #include "ash/test/ash_test_base.h" | 12 #include "ash/test/ash_test_base.h" |
13 #include "ash/test/display_manager_test_api.h" | 13 #include "ash/test/display_manager_test_api.h" |
14 #include "ash/test/test_system_tray_delegate.h" | 14 #include "ash/test/test_system_tray_delegate.h" |
15 #include "base/strings/string16.h" | 15 #include "base/strings/string16.h" |
16 #include "base/strings/string_util.h" | 16 #include "base/strings/string_util.h" |
17 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
18 #include "grit/ash_strings.h" | 18 #include "grit/ash_strings.h" |
19 #include "ui/accessibility/ax_view_state.h" | 19 #include "ui/accessibility/ax_view_state.h" |
20 #include "ui/base/l10n/l10n_util.h" | 20 #include "ui/base/l10n/l10n_util.h" |
21 #include "ui/display/display.h" | 21 #include "ui/display/display.h" |
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
608 display::Display::ROTATION_SOURCE_ACCELEROMETER); | 608 display::Display::ROTATION_SOURCE_ACCELEROMETER); |
609 EXPECT_FALSE(IsDisplayVisibleInTray()); | 609 EXPECT_FALSE(IsDisplayVisibleInTray()); |
610 | 610 |
611 // If a non-rotation setting is changed, display regardless of the source of | 611 // If a non-rotation setting is changed, display regardless of the source of |
612 // rotation so that the full message is shown. | 612 // rotation so that the full message is shown. |
613 UpdateDisplay("400x400@1.5"); | 613 UpdateDisplay("400x400@1.5"); |
614 EXPECT_TRUE(IsDisplayVisibleInTray()); | 614 EXPECT_TRUE(IsDisplayVisibleInTray()); |
615 } | 615 } |
616 | 616 |
617 } // namespace ash | 617 } // namespace ash |
OLD | NEW |