OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/native_widget_aura.h" | 5 #include "ui/views/widget/native_widget_aura.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "ui/aura/client/aura_constants.h" | 9 #include "ui/aura/client/aura_constants.h" |
10 #include "ui/aura/client/drag_drop_client.h" | 10 #include "ui/aura/client/drag_drop_client.h" |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 gfx::Point* offset, | 228 gfx::Point* offset, |
229 ui::Layer** layer_parent) { | 229 ui::Layer** layer_parent) { |
230 if (layer_parent) | 230 if (layer_parent) |
231 *layer_parent = window_->layer(); | 231 *layer_parent = window_->layer(); |
232 } | 232 } |
233 | 233 |
234 void NativeWidgetAura::ReorderLayers() { | 234 void NativeWidgetAura::ReorderLayers() { |
235 } | 235 } |
236 | 236 |
237 void NativeWidgetAura::ViewRemoved(View* view) { | 237 void NativeWidgetAura::ViewRemoved(View* view) { |
238 // DropTarget stuff. Most likely http://crbug.com/97845 | 238 DCHECK(drop_helper_.get() != NULL); |
239 //NOTIMPLEMENTED(); | 239 drop_helper_->ResetTargetViewIfEquals(view); |
240 } | 240 } |
241 | 241 |
242 void NativeWidgetAura::SetNativeWindowProperty(const char* name, void* value) { | 242 void NativeWidgetAura::SetNativeWindowProperty(const char* name, void* value) { |
243 if (window_) | 243 if (window_) |
244 window_->SetProperty(name, value); | 244 window_->SetProperty(name, value); |
245 } | 245 } |
246 | 246 |
247 void* NativeWidgetAura::GetNativeWindowProperty(const char* name) const { | 247 void* NativeWidgetAura::GetNativeWindowProperty(const char* name) const { |
248 return window_ ? window_->GetProperty(name) : NULL; | 248 return window_ ? window_->GetProperty(name) : NULL; |
249 } | 249 } |
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
779 NOTIMPLEMENTED(); | 779 NOTIMPLEMENTED(); |
780 } | 780 } |
781 | 781 |
782 // static | 782 // static |
783 bool NativeWidgetPrivate::IsMouseButtonDown() { | 783 bool NativeWidgetPrivate::IsMouseButtonDown() { |
784 return aura::Desktop::GetInstance()->IsMouseButtonDown(); | 784 return aura::Desktop::GetInstance()->IsMouseButtonDown(); |
785 } | 785 } |
786 | 786 |
787 } // namespace internal | 787 } // namespace internal |
788 } // namespace views | 788 } // namespace views |
OLD | NEW |