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/shelf/shelf_layout_manager.h" | 5 #include "ash/shelf/shelf_layout_manager.h" |
6 | 6 |
7 #include "ash/accelerators/accelerator_controller.h" | 7 #include "ash/accelerators/accelerator_controller.h" |
8 #include "ash/accelerators/accelerator_table.h" | 8 #include "ash/accelerators/accelerator_table.h" |
9 #include "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" |
10 #include "ash/display/display_manager.h" | 10 #include "ash/display/display_manager.h" |
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
359 // delete on TearDown). | 359 // delete on TearDown). |
360 views::Widget* CreateTestWidget() { | 360 views::Widget* CreateTestWidget() { |
361 views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW); | 361 views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW); |
362 params.bounds = gfx::Rect(0, 0, 200, 200); | 362 params.bounds = gfx::Rect(0, 0, 200, 200); |
363 params.context = CurrentContext(); | 363 params.context = CurrentContext(); |
364 return CreateTestWidgetWithParams(params); | 364 return CreateTestWidgetWithParams(params); |
365 } | 365 } |
366 | 366 |
367 // Overridden from AshTestBase: | 367 // Overridden from AshTestBase: |
368 virtual void SetUp() override { | 368 virtual void SetUp() override { |
369 CommandLine::ForCurrentProcess()->AppendSwitch( | 369 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
370 ash::switches::kAshEnableTrayDragging); | 370 ash::switches::kAshEnableTrayDragging); |
371 test::AshTestBase::SetUp(); | 371 test::AshTestBase::SetUp(); |
372 } | 372 } |
373 | 373 |
374 void RunGestureDragTests(gfx::Vector2d); | 374 void RunGestureDragTests(gfx::Vector2d); |
375 | 375 |
376 private: | 376 private: |
377 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManagerTest); | 377 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManagerTest); |
378 }; | 378 }; |
379 | 379 |
(...skipping 1643 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2023 shelf_manager->SetAutoHideBehavior(SHELF_AUTO_HIDE_ALWAYS_HIDDEN); | 2023 shelf_manager->SetAutoHideBehavior(SHELF_AUTO_HIDE_ALWAYS_HIDDEN); |
2024 gfx::Rect hide_target_bounds = status_window->GetTargetBounds(); | 2024 gfx::Rect hide_target_bounds = status_window->GetTargetBounds(); |
2025 EXPECT_GT(hide_target_bounds.y(), initial_bounds.y()); | 2025 EXPECT_GT(hide_target_bounds.y(), initial_bounds.y()); |
2026 | 2026 |
2027 shelf_manager->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER); | 2027 shelf_manager->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER); |
2028 gfx::Rect reshow_target_bounds = status_window->GetTargetBounds(); | 2028 gfx::Rect reshow_target_bounds = status_window->GetTargetBounds(); |
2029 EXPECT_EQ(initial_bounds, reshow_target_bounds); | 2029 EXPECT_EQ(initial_bounds, reshow_target_bounds); |
2030 } | 2030 } |
2031 | 2031 |
2032 } // namespace ash | 2032 } // namespace ash |
OLD | NEW |