| 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/common/wm/panels/panel_layout_manager.h" | 5 #include "ash/common/wm/panels/panel_layout_manager.h" |
| 6 | 6 |
| 7 #include "ash/common/shelf/shelf_button.h" | 7 #include "ash/common/shelf/shelf_button.h" |
| 8 #include "ash/common/shelf/shelf_layout_manager.h" | 8 #include "ash/common/shelf/shelf_layout_manager.h" |
| 9 #include "ash/common/shelf/shelf_model.h" | 9 #include "ash/common/shelf/shelf_model.h" |
| 10 #include "ash/common/shelf/shelf_view.h" | 10 #include "ash/common/shelf/shelf_view.h" |
| (...skipping 826 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 837 // we exit fullscreen mode. | 837 // we exit fullscreen mode. |
| 838 w3.reset(CreatePanelWindow(bounds)); | 838 w3.reset(CreatePanelWindow(bounds)); |
| 839 | 839 |
| 840 EXPECT_FALSE(w1->IsVisible()); | 840 EXPECT_FALSE(w1->IsVisible()); |
| 841 EXPECT_FALSE(w2->IsVisible()); | 841 EXPECT_FALSE(w2->IsVisible()); |
| 842 EXPECT_FALSE(w3->IsVisible()); | 842 EXPECT_FALSE(w3->IsVisible()); |
| 843 | 843 |
| 844 // While in full-screen mode, the panel windows should still be in the | 844 // While in full-screen mode, the panel windows should still be in the |
| 845 // switchable window list - http://crbug.com/313919. | 845 // switchable window list - http://crbug.com/313919. |
| 846 aura::Window::Windows switchable_window_list = WmWindow::ToAuraWindows( | 846 aura::Window::Windows switchable_window_list = WmWindow::ToAuraWindows( |
| 847 WmShell::Get()->mru_window_tracker()->BuildMruWindowList()); | 847 Shell::Get()->mru_window_tracker()->BuildMruWindowList()); |
| 848 EXPECT_EQ(3u, switchable_window_list.size()); | 848 EXPECT_EQ(3u, switchable_window_list.size()); |
| 849 EXPECT_NE(switchable_window_list.end(), | 849 EXPECT_NE(switchable_window_list.end(), |
| 850 std::find(switchable_window_list.begin(), | 850 std::find(switchable_window_list.begin(), |
| 851 switchable_window_list.end(), w1.get())); | 851 switchable_window_list.end(), w1.get())); |
| 852 EXPECT_NE(switchable_window_list.end(), | 852 EXPECT_NE(switchable_window_list.end(), |
| 853 std::find(switchable_window_list.begin(), | 853 std::find(switchable_window_list.begin(), |
| 854 switchable_window_list.end(), w2.get())); | 854 switchable_window_list.end(), w2.get())); |
| 855 EXPECT_NE(switchable_window_list.end(), | 855 EXPECT_NE(switchable_window_list.end(), |
| 856 std::find(switchable_window_list.begin(), | 856 std::find(switchable_window_list.begin(), |
| 857 switchable_window_list.end(), w3.get())); | 857 switchable_window_list.end(), w3.get())); |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 920 touch.set_location(gfx::Point(bounds.x() - 1, bounds.y() + 5)); | 920 touch.set_location(gfx::Point(bounds.x() - 1, bounds.y() + 5)); |
| 921 target = targeter->FindTargetForEvent(root, &touch); | 921 target = targeter->FindTargetForEvent(root, &touch); |
| 922 EXPECT_NE(w.get(), target); | 922 EXPECT_NE(w.get(), target); |
| 923 } | 923 } |
| 924 | 924 |
| 925 INSTANTIATE_TEST_CASE_P(LtrRtl, | 925 INSTANTIATE_TEST_CASE_P(LtrRtl, |
| 926 PanelLayoutManagerTextDirectionTest, | 926 PanelLayoutManagerTextDirectionTest, |
| 927 testing::Bool()); | 927 testing::Bool()); |
| 928 | 928 |
| 929 } // namespace ash | 929 } // namespace ash |
| OLD | NEW |