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/wm/common/panels/panel_layout_manager.h" | 5 #include "ash/wm/common/panels/panel_layout_manager.h" |
6 | 6 |
7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/screen_util.h" | 8 #include "ash/screen_util.h" |
9 #include "ash/shelf/shelf.h" | 9 #include "ash/shelf/shelf.h" |
10 #include "ash/shelf/shelf_button.h" | 10 #include "ash/shelf/shelf_button.h" |
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 Shelf::ForWindow(root_window)->SetAlignment(alignment); | 214 Shelf::ForWindow(root_window)->SetAlignment(alignment); |
215 } | 215 } |
216 | 216 |
217 wm::ShelfAlignment GetAlignment(const aura::Window* root_window) { | 217 wm::ShelfAlignment GetAlignment(const aura::Window* root_window) { |
218 return Shelf::ForWindow(root_window)->alignment(); | 218 return Shelf::ForWindow(root_window)->alignment(); |
219 } | 219 } |
220 | 220 |
221 void SetShelfAutoHideBehavior(aura::Window* window, | 221 void SetShelfAutoHideBehavior(aura::Window* window, |
222 ShelfAutoHideBehavior behavior) { | 222 ShelfAutoHideBehavior behavior) { |
223 Shelf* shelf = Shelf::ForWindow(window); | 223 Shelf* shelf = Shelf::ForWindow(window); |
224 shelf->shelf_layout_manager()->SetAutoHideBehavior(behavior); | 224 shelf->SetAutoHideBehavior(behavior); |
225 test::ShelfViewTestAPI test_api(GetShelfView(shelf)); | 225 test::ShelfViewTestAPI test_api(GetShelfView(shelf)); |
226 test_api.RunMessageLoopUntilAnimationsDone(); | 226 test_api.RunMessageLoopUntilAnimationsDone(); |
227 } | 227 } |
228 | 228 |
229 void SetShelfVisibilityState(aura::Window* window, | 229 void SetShelfVisibilityState(aura::Window* window, |
230 ShelfVisibilityState visibility_state) { | 230 ShelfVisibilityState visibility_state) { |
231 Shelf* shelf = Shelf::ForWindow(window); | 231 Shelf* shelf = Shelf::ForWindow(window); |
232 shelf->shelf_layout_manager()->SetState(visibility_state); | 232 shelf->shelf_layout_manager()->SetState(visibility_state); |
233 } | 233 } |
234 | 234 |
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
813 // Hit test outside the left edge with a left-aligned shelf. | 813 // Hit test outside the left edge with a left-aligned shelf. |
814 touch.set_location(gfx::Point(bounds.x() - 1, bounds.y() + 5)); | 814 touch.set_location(gfx::Point(bounds.x() - 1, bounds.y() + 5)); |
815 target = targeter->FindTargetForEvent(root, &touch); | 815 target = targeter->FindTargetForEvent(root, &touch); |
816 EXPECT_NE(w.get(), target); | 816 EXPECT_NE(w.get(), target); |
817 } | 817 } |
818 | 818 |
819 INSTANTIATE_TEST_CASE_P(LtrRtl, PanelLayoutManagerTextDirectionTest, | 819 INSTANTIATE_TEST_CASE_P(LtrRtl, PanelLayoutManagerTextDirectionTest, |
820 testing::Bool()); | 820 testing::Bool()); |
821 | 821 |
822 } // namespace ash | 822 } // namespace ash |
OLD | NEW |