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/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 "third_party/skia/include/core/SkRegion.h" | 9 #include "third_party/skia/include/core/SkRegion.h" |
10 #include "ui/aura/client/activation_change_observer.h" | 10 #include "ui/aura/client/activation_change_observer.h" |
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
552 | 552 |
553 bool NativeWidgetAura::IsAccessibleWidget() const { | 553 bool NativeWidgetAura::IsAccessibleWidget() const { |
554 // http://crbug.com/102570 | 554 // http://crbug.com/102570 |
555 // NOTIMPLEMENTED(); | 555 // NOTIMPLEMENTED(); |
556 return false; | 556 return false; |
557 } | 557 } |
558 | 558 |
559 void NativeWidgetAura::RunShellDrag(View* view, | 559 void NativeWidgetAura::RunShellDrag(View* view, |
560 const ui::OSExchangeData& data, | 560 const ui::OSExchangeData& data, |
561 const gfx::Point& location, | 561 const gfx::Point& location, |
562 int operation) { | 562 int operation, |
563 views::RunShellDrag(window_, data, location, operation); | 563 ui::DragDropTypes::DragEventSource source) { |
| 564 views::RunShellDrag(window_, data, location, operation, source); |
564 } | 565 } |
565 | 566 |
566 void NativeWidgetAura::SchedulePaintInRect(const gfx::Rect& rect) { | 567 void NativeWidgetAura::SchedulePaintInRect(const gfx::Rect& rect) { |
567 if (window_) | 568 if (window_) |
568 window_->SchedulePaintInRect(rect); | 569 window_->SchedulePaintInRect(rect); |
569 } | 570 } |
570 | 571 |
571 void NativeWidgetAura::SetCursor(gfx::NativeCursor cursor) { | 572 void NativeWidgetAura::SetCursor(gfx::NativeCursor cursor) { |
572 cursor_ = cursor; | 573 cursor_ = cursor; |
573 aura::client::CursorClient* cursor_client = | 574 aura::client::CursorClient* cursor_client = |
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1001 return aura::Env::GetInstance()->is_mouse_button_down(); | 1002 return aura::Env::GetInstance()->is_mouse_button_down(); |
1002 } | 1003 } |
1003 | 1004 |
1004 // static | 1005 // static |
1005 bool NativeWidgetPrivate::IsTouchDown() { | 1006 bool NativeWidgetPrivate::IsTouchDown() { |
1006 return aura::Env::GetInstance()->is_touch_down(); | 1007 return aura::Env::GetInstance()->is_touch_down(); |
1007 } | 1008 } |
1008 | 1009 |
1009 } // namespace internal | 1010 } // namespace internal |
1010 } // namespace views | 1011 } // namespace views |
OLD | NEW |