| 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 "ui/views/mus/native_widget_mus.h" | 5 #include "ui/views/mus/native_widget_mus.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
| (...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 | 358 |
| 359 mus::mojom::ShowState show_state() { return show_state_; } | 359 mus::mojom::ShowState show_state() { return show_state_; } |
| 360 | 360 |
| 361 // mus::WindowObserver: | 361 // mus::WindowObserver: |
| 362 void OnWindowVisibilityChanging(mus::Window* window) override { | 362 void OnWindowVisibilityChanging(mus::Window* window) override { |
| 363 native_widget_mus_->OnMusWindowVisibilityChanging(window); | 363 native_widget_mus_->OnMusWindowVisibilityChanging(window); |
| 364 } | 364 } |
| 365 void OnWindowVisibilityChanged(mus::Window* window) override { | 365 void OnWindowVisibilityChanged(mus::Window* window) override { |
| 366 native_widget_mus_->OnMusWindowVisibilityChanged(window); | 366 native_widget_mus_->OnMusWindowVisibilityChanged(window); |
| 367 } | 367 } |
| 368 void OnWindowBoundsChanged(mus::Window* window, | |
| 369 const gfx::Rect& old_bounds, | |
| 370 const gfx::Rect& new_bounds) override { | |
| 371 platform_window_delegate()->OnBoundsChanged(new_bounds); | |
| 372 } | |
| 373 void OnWindowPredefinedCursorChanged(mus::Window* window, | 368 void OnWindowPredefinedCursorChanged(mus::Window* window, |
| 374 mus::mojom::Cursor cursor) override { | 369 mus::mojom::Cursor cursor) override { |
| 375 DCHECK_EQ(window, mus_window()); | 370 DCHECK_EQ(window, mus_window()); |
| 376 native_widget_mus_->set_last_cursor(cursor); | 371 native_widget_mus_->set_last_cursor(cursor); |
| 377 } | 372 } |
| 378 void OnWindowSharedPropertyChanged( | 373 void OnWindowSharedPropertyChanged( |
| 379 mus::Window* window, | 374 mus::Window* window, |
| 380 const std::string& name, | 375 const std::string& name, |
| 381 const std::vector<uint8_t>* old_data, | 376 const std::vector<uint8_t>* old_data, |
| 382 const std::vector<uint8_t>* new_data) override { | 377 const std::vector<uint8_t>* new_data) override { |
| (...skipping 991 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1374 | 1369 |
| 1375 gfx::Path mask_path; | 1370 gfx::Path mask_path; |
| 1376 native_widget_delegate_->GetHitTestMask(&mask_path); | 1371 native_widget_delegate_->GetHitTestMask(&mask_path); |
| 1377 // TODO(jamescook): Use the full path for the mask. | 1372 // TODO(jamescook): Use the full path for the mask. |
| 1378 gfx::Rect mask_rect = | 1373 gfx::Rect mask_rect = |
| 1379 gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds())); | 1374 gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds())); |
| 1380 window_->SetHitTestMask(mask_rect); | 1375 window_->SetHitTestMask(mask_rect); |
| 1381 } | 1376 } |
| 1382 | 1377 |
| 1383 } // namespace views | 1378 } // namespace views |
| OLD | NEW |