| 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 <algorithm> | 5 #include <algorithm> |
| 6 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "ash/accessibility_delegate.h" | 8 #include "ash/accessibility_delegate.h" |
| 9 #include "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" |
| 10 #include "ash/display/display_layout.h" | 10 #include "ash/display/display_layout.h" |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 // views::Widget::GetWidgetForNativeView(window)->Close(). | 117 // views::Widget::GetWidgetForNativeView(window)->Close(). |
| 118 scoped_ptr<views::Widget> CreateWindowWidget(const gfx::Rect& bounds) { | 118 scoped_ptr<views::Widget> CreateWindowWidget(const gfx::Rect& bounds) { |
| 119 scoped_ptr<views::Widget> widget(new views::Widget); | 119 scoped_ptr<views::Widget> widget(new views::Widget); |
| 120 views::Widget::InitParams params; | 120 views::Widget::InitParams params; |
| 121 params.bounds = bounds; | 121 params.bounds = bounds; |
| 122 params.type = views::Widget::InitParams::TYPE_WINDOW; | 122 params.type = views::Widget::InitParams::TYPE_WINDOW; |
| 123 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; | 123 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
| 124 widget->Init(params); | 124 widget->Init(params); |
| 125 widget->Show(); | 125 widget->Show(); |
| 126 ParentWindowInPrimaryRootWindow(widget->GetNativeWindow()); | 126 ParentWindowInPrimaryRootWindow(widget->GetNativeWindow()); |
| 127 return widget.Pass(); | 127 return widget; |
| 128 } | 128 } |
| 129 | 129 |
| 130 aura::Window* CreatePanelWindow(const gfx::Rect& bounds) { | 130 aura::Window* CreatePanelWindow(const gfx::Rect& bounds) { |
| 131 aura::Window* window = CreateTestWindowInShellWithDelegateAndType( | 131 aura::Window* window = CreateTestWindowInShellWithDelegateAndType( |
| 132 nullptr, ui::wm::WINDOW_TYPE_PANEL, 0, bounds); | 132 nullptr, ui::wm::WINDOW_TYPE_PANEL, 0, bounds); |
| 133 test::TestShelfDelegate::instance()->AddShelfItem(window); | 133 test::TestShelfDelegate::instance()->AddShelfItem(window); |
| 134 shelf_view_test()->RunMessageLoopUntilAnimationsDone(); | 134 shelf_view_test()->RunMessageLoopUntilAnimationsDone(); |
| 135 return window; | 135 return window; |
| 136 } | 136 } |
| 137 | 137 |
| (...skipping 1488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1626 // Switch to overview mode. | 1626 // Switch to overview mode. |
| 1627 ToggleOverview(); | 1627 ToggleOverview(); |
| 1628 ASSERT_TRUE(IsSelecting()); | 1628 ASSERT_TRUE(IsSelecting()); |
| 1629 | 1629 |
| 1630 // Tap should now exit overview mode. | 1630 // Tap should now exit overview mode. |
| 1631 generator.GestureTapAt(point_in_background_page); | 1631 generator.GestureTapAt(point_in_background_page); |
| 1632 EXPECT_FALSE(IsSelecting()); | 1632 EXPECT_FALSE(IsSelecting()); |
| 1633 } | 1633 } |
| 1634 | 1634 |
| 1635 } // namespace ash | 1635 } // namespace ash |
| OLD | NEW |