| 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/drag_window_resizer.h" | 5 #include "ash/wm/drag_window_resizer.h" |
| 6 | 6 |
| 7 #include "ash/display/mouse_cursor_event_filter.h" | 7 #include "ash/display/mouse_cursor_event_filter.h" |
| 8 #include "ash/screen_util.h" | 8 #include "ash/screen_util.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/wm/coordinate_conversion.h" | 10 #include "ash/wm/coordinate_conversion.h" |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 drag_window_controller_->SetOpacity(phantom_opacity); | 199 drag_window_controller_->SetOpacity(phantom_opacity); |
| 200 GetTarget()->layer()->SetOpacity(window_opacity); | 200 GetTarget()->layer()->SetOpacity(window_opacity); |
| 201 } else { | 201 } else { |
| 202 drag_window_controller_.reset(); | 202 drag_window_controller_.reset(); |
| 203 GetTarget()->layer()->SetOpacity(1.0f); | 203 GetTarget()->layer()->SetOpacity(1.0f); |
| 204 } | 204 } |
| 205 } | 205 } |
| 206 | 206 |
| 207 bool DragWindowResizer::ShouldAllowMouseWarp() { | 207 bool DragWindowResizer::ShouldAllowMouseWarp() { |
| 208 return (details().window_component == HTCAPTION) && | 208 return (details().window_component == HTCAPTION) && |
| 209 !views::corewm::GetTransientParent(GetTarget()) && | 209 !::wm::GetTransientParent(GetTarget()) && |
| 210 (GetTarget()->type() == ui::wm::WINDOW_TYPE_NORMAL || | 210 (GetTarget()->type() == ui::wm::WINDOW_TYPE_NORMAL || |
| 211 GetTarget()->type() == ui::wm::WINDOW_TYPE_PANEL); | 211 GetTarget()->type() == ui::wm::WINDOW_TYPE_PANEL); |
| 212 } | 212 } |
| 213 | 213 |
| 214 } // namespace internal | 214 } // namespace internal |
| 215 } // namespace ash | 215 } // namespace ash |
| OLD | NEW |