| 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/workspace/multi_window_resize_controller.h" | 5 #include "ash/wm/workspace/multi_window_resize_controller.h" |
| 6 | 6 |
| 7 #include "ash/ash_constants.h" | 7 #include "ash/ash_constants.h" |
| 8 #include "ash/frame/custom_frame_view_ash.h" | 8 #include "ash/frame/custom_frame_view_ash.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/test/ash_test_base.h" | 10 #include "ash/test/ash_test_base.h" |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 | 78 |
| 79 bool IsShowing() { return resize_controller_->IsShowing(); } | 79 bool IsShowing() { return resize_controller_->IsShowing(); } |
| 80 | 80 |
| 81 bool HasPendingShow() { return resize_controller_->show_timer_.IsRunning(); } | 81 bool HasPendingShow() { return resize_controller_->show_timer_.IsRunning(); } |
| 82 | 82 |
| 83 void Hide() { resize_controller_->Hide(); } | 83 void Hide() { resize_controller_->Hide(); } |
| 84 | 84 |
| 85 bool HasTarget(aura::Window* window) { | 85 bool HasTarget(aura::Window* window) { |
| 86 if (!resize_controller_->windows_.is_valid()) | 86 if (!resize_controller_->windows_.is_valid()) |
| 87 return false; | 87 return false; |
| 88 WmWindow* wm_window = WmWindow::Get(window); | 88 if (resize_controller_->windows_.window1 == window || |
| 89 if ((resize_controller_->windows_.window1 == wm_window || | 89 resize_controller_->windows_.window2 == window) { |
| 90 resize_controller_->windows_.window2 == wm_window)) | |
| 91 return true; | 90 return true; |
| 91 } |
| 92 return base::ContainsValue(resize_controller_->windows_.other_windows, | 92 return base::ContainsValue(resize_controller_->windows_.other_windows, |
| 93 wm_window); | 93 window); |
| 94 } | 94 } |
| 95 | 95 |
| 96 bool IsOverWindows(const gfx::Point& loc) { | 96 bool IsOverWindows(const gfx::Point& loc) { |
| 97 return resize_controller_->IsOverWindows(loc); | 97 return resize_controller_->IsOverWindows(loc); |
| 98 } | 98 } |
| 99 | 99 |
| 100 views::Widget* resize_widget() { | 100 views::Widget* resize_widget() { |
| 101 return resize_controller_->resize_widget_.get(); | 101 return resize_controller_->resize_widget_.get(); |
| 102 } | 102 } |
| 103 | 103 |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 | 355 |
| 356 // Clicking outside the resize handle should immediately hide the resize | 356 // Clicking outside the resize handle should immediately hide the resize |
| 357 // handle. | 357 // handle. |
| 358 EXPECT_FALSE(resize_widget_bounds_in_screen.Contains(w1_center_in_screen)); | 358 EXPECT_FALSE(resize_widget_bounds_in_screen.Contains(w1_center_in_screen)); |
| 359 generator.MoveMouseTo(w1_center_in_screen); | 359 generator.MoveMouseTo(w1_center_in_screen); |
| 360 generator.ClickLeftButton(); | 360 generator.ClickLeftButton(); |
| 361 EXPECT_FALSE(IsShowing()); | 361 EXPECT_FALSE(IsShowing()); |
| 362 } | 362 } |
| 363 | 363 |
| 364 } // namespace ash | 364 } // namespace ash |
| OLD | NEW |