| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/exo/shell_surface.h" | 5 #include "components/exo/shell_surface.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "ash/aura/wm_window_aura.h" | |
| 10 #include "ash/common/frame/custom_frame_view_ash.h" | 9 #include "ash/common/frame/custom_frame_view_ash.h" |
| 11 #include "ash/common/shelf/wm_shelf.h" | 10 #include "ash/common/shelf/wm_shelf.h" |
| 12 #include "ash/common/wm/window_resizer.h" | 11 #include "ash/common/wm/window_resizer.h" |
| 13 #include "ash/common/wm/window_state.h" | 12 #include "ash/common/wm/window_state.h" |
| 14 #include "ash/common/wm/window_state_delegate.h" | 13 #include "ash/common/wm/window_state_delegate.h" |
| 15 #include "ash/common/wm_shell.h" | 14 #include "ash/common/wm_shell.h" |
| 15 #include "ash/common/wm_window.h" |
| 16 #include "ash/public/cpp/shell_window_ids.h" | 16 #include "ash/public/cpp/shell_window_ids.h" |
| 17 #include "ash/wm/window_state_aura.h" | 17 #include "ash/wm/window_state_aura.h" |
| 18 #include "ash/wm/window_util.h" | 18 #include "ash/wm/window_util.h" |
| 19 #include "base/logging.h" | 19 #include "base/logging.h" |
| 20 #include "base/macros.h" | 20 #include "base/macros.h" |
| 21 #include "base/memory/ptr_util.h" | 21 #include "base/memory/ptr_util.h" |
| 22 #include "base/strings/utf_string_conversions.h" | 22 #include "base/strings/utf_string_conversions.h" |
| 23 #include "base/trace_event/trace_event.h" | 23 #include "base/trace_event/trace_event.h" |
| 24 #include "base/trace_event/trace_event_argument.h" | 24 #include "base/trace_event/trace_event_argument.h" |
| 25 #include "components/exo/surface.h" | 25 #include "components/exo/surface.h" |
| (...skipping 1213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1239 break; | 1239 break; |
| 1240 case HTTOPLEFT: | 1240 case HTTOPLEFT: |
| 1241 cursor_client->SetCursor(ui::kCursorNorthWestResize); | 1241 cursor_client->SetCursor(ui::kCursorNorthWestResize); |
| 1242 break; | 1242 break; |
| 1243 default: | 1243 default: |
| 1244 NOTREACHED(); | 1244 NOTREACHED(); |
| 1245 break; | 1245 break; |
| 1246 } | 1246 } |
| 1247 | 1247 |
| 1248 resizer_ = ash::CreateWindowResizer( | 1248 resizer_ = ash::CreateWindowResizer( |
| 1249 ash::WmWindowAura::Get(widget_->GetNativeWindow()), drag_location, | 1249 ash::WmWindow::Get(widget_->GetNativeWindow()), drag_location, component, |
| 1250 component, aura::client::WINDOW_MOVE_SOURCE_MOUSE); | 1250 aura::client::WINDOW_MOVE_SOURCE_MOUSE); |
| 1251 if (!resizer_) | 1251 if (!resizer_) |
| 1252 return; | 1252 return; |
| 1253 | 1253 |
| 1254 // Apply pending origin offsets and resize direction before starting a new | 1254 // Apply pending origin offsets and resize direction before starting a new |
| 1255 // resize operation. These can still be pending if the client has acknowledged | 1255 // resize operation. These can still be pending if the client has acknowledged |
| 1256 // the configure request but not yet called Commit(). | 1256 // the configure request but not yet called Commit(). |
| 1257 origin_ += pending_origin_offset_; | 1257 origin_ += pending_origin_offset_; |
| 1258 pending_origin_offset_ = gfx::Vector2d(); | 1258 pending_origin_offset_ = gfx::Vector2d(); |
| 1259 resize_component_ = pending_resize_component_; | 1259 resize_component_ = pending_resize_component_; |
| 1260 | 1260 |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1503 shadow_overlay_->SetBounds(shadow_bounds); | 1503 shadow_overlay_->SetBounds(shadow_bounds); |
| 1504 shadow->SetContentBounds(gfx::Rect(shadow_bounds.size())); | 1504 shadow->SetContentBounds(gfx::Rect(shadow_bounds.size())); |
| 1505 // Surfaces that can't be activated are usually menus and tooltips. Use a | 1505 // Surfaces that can't be activated are usually menus and tooltips. Use a |
| 1506 // small style shadow for them. | 1506 // small style shadow for them. |
| 1507 if (!activatable_) | 1507 if (!activatable_) |
| 1508 shadow->SetElevation(wm::ShadowElevation::SMALL); | 1508 shadow->SetElevation(wm::ShadowElevation::SMALL); |
| 1509 } | 1509 } |
| 1510 } | 1510 } |
| 1511 | 1511 |
| 1512 } // namespace exo | 1512 } // namespace exo |
| OLD | NEW |