OLD | NEW |
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/system/tray/system_tray.h" | 5 #include "ash/system/tray/system_tray.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
10 #include "ash/shelf/shelf_widget.h" | 10 #include "ash/shelf/shelf_widget.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/tray/system_tray_item.h" | 13 #include "ash/system/tray/system_tray_item.h" |
14 #include "ash/test/ash_test_base.h" | 14 #include "ash/test/ash_test_base.h" |
15 #include "base/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
16 #include "ui/views/controls/label.h" | 16 #include "ui/views/controls/label.h" |
17 #include "ui/views/layout/fill_layout.h" | 17 #include "ui/views/layout/fill_layout.h" |
18 #include "ui/views/view.h" | 18 #include "ui/views/view.h" |
19 #include "ui/views/widget/widget.h" | 19 #include "ui/views/widget/widget.h" |
20 | 20 |
21 #if defined(OS_WIN) | 21 #if defined(OS_WIN) |
22 #include "base/win/windows_version.h" | 22 #include "base/win/windows_version.h" |
23 #endif | 23 #endif |
24 | 24 |
25 namespace ash { | 25 namespace ash { |
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
323 // Test in the right alignment. Right and bottom edges should match. | 323 // Test in the right alignment. Right and bottom edges should match. |
324 widget->SetShelfAlignment(SHELF_ALIGNMENT_LEFT); | 324 widget->SetShelfAlignment(SHELF_ALIGNMENT_LEFT); |
325 window_bounds = widget->GetWindowBoundsInScreen(); | 325 window_bounds = widget->GetWindowBoundsInScreen(); |
326 tray_bounds = tray->GetBoundsInScreen(); | 326 tray_bounds = tray->GetBoundsInScreen(); |
327 EXPECT_EQ(window_bounds.bottom(), tray_bounds.bottom()); | 327 EXPECT_EQ(window_bounds.bottom(), tray_bounds.bottom()); |
328 EXPECT_EQ(window_bounds.right(), tray_bounds.right()); | 328 EXPECT_EQ(window_bounds.right(), tray_bounds.right()); |
329 } | 329 } |
330 | 330 |
331 } // namespace test | 331 } // namespace test |
332 } // namespace ash | 332 } // namespace ash |
OLD | NEW |