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 "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | 5 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 #include "ui/aura/client/aura_constants.h" | 9 #include "ui/aura/client/aura_constants.h" |
10 #include "ui/aura/client/cursor_client.h" | 10 #include "ui/aura/client/cursor_client.h" |
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
584 | 584 |
585 ui::Layer* DesktopNativeWidgetAura::GetLayer() { | 585 ui::Layer* DesktopNativeWidgetAura::GetLayer() { |
586 return content_window_ ? content_window_->layer() : NULL; | 586 return content_window_ ? content_window_->layer() : NULL; |
587 } | 587 } |
588 | 588 |
589 void DesktopNativeWidgetAura::ReorderNativeViews() { | 589 void DesktopNativeWidgetAura::ReorderNativeViews() { |
590 window_reorderer_->ReorderChildWindows(); | 590 window_reorderer_->ReorderChildWindows(); |
591 } | 591 } |
592 | 592 |
593 void DesktopNativeWidgetAura::ViewRemoved(View* view) { | 593 void DesktopNativeWidgetAura::ViewRemoved(View* view) { |
594 DCHECK(drop_helper_.get() != NULL); | |
595 drop_helper_->ResetTargetViewIfEquals(view); | |
sadrul
2014/03/26 18:01:07
Can this have a test?
varkha
2014/03/27 04:48:13
Moved to https://codereview.chromium.org/214083004
| |
594 } | 596 } |
595 | 597 |
596 void DesktopNativeWidgetAura::SetNativeWindowProperty(const char* name, | 598 void DesktopNativeWidgetAura::SetNativeWindowProperty(const char* name, |
597 void* value) { | 599 void* value) { |
598 if (content_window_) | 600 if (content_window_) |
599 content_window_->SetNativeWindowProperty(name, value); | 601 content_window_->SetNativeWindowProperty(name, value); |
600 } | 602 } |
601 | 603 |
602 void* DesktopNativeWidgetAura::GetNativeWindowProperty(const char* name) const { | 604 void* DesktopNativeWidgetAura::GetNativeWindowProperty(const char* name) const { |
603 return content_window_ ? | 605 return content_window_ ? |
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1193 if (cursor_reference_count_ == 0) { | 1195 if (cursor_reference_count_ == 0) { |
1194 // We are the last DesktopNativeWidgetAura instance, and we are responsible | 1196 // We are the last DesktopNativeWidgetAura instance, and we are responsible |
1195 // for cleaning up |cursor_manager_|. | 1197 // for cleaning up |cursor_manager_|. |
1196 delete cursor_manager_; | 1198 delete cursor_manager_; |
1197 native_cursor_manager_ = NULL; | 1199 native_cursor_manager_ = NULL; |
1198 cursor_manager_ = NULL; | 1200 cursor_manager_ = NULL; |
1199 } | 1201 } |
1200 } | 1202 } |
1201 | 1203 |
1202 } // namespace views | 1204 } // namespace views |
OLD | NEW |