Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

Side by Side Diff: ui/views/widget/native_widget_aura.cc

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/views/widget/native_widget_aura.h ('k') | ui/views/widget/native_widget_aura_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 804 matching lines...) Expand 10 before | Expand all | Expand 10 after
815 if (tooltip_manager_.get()) 815 if (tooltip_manager_.get())
816 tooltip_manager_->UpdateTooltip(); 816 tooltip_manager_->UpdateTooltip();
817 return delegate_->OnMouseEvent(*event); 817 return delegate_->OnMouseEvent(*event);
818 } 818 }
819 819
820 ui::TouchStatus NativeWidgetAura::OnTouchEvent(ui::TouchEvent* event) { 820 ui::TouchStatus NativeWidgetAura::OnTouchEvent(ui::TouchEvent* event) {
821 DCHECK(window_->IsVisible()); 821 DCHECK(window_->IsVisible());
822 return delegate_->OnTouchEvent(*event); 822 return delegate_->OnTouchEvent(*event);
823 } 823 }
824 824
825 ui::GestureStatus NativeWidgetAura::OnGestureEvent( 825 ui::EventResult NativeWidgetAura::OnGestureEvent(
826 ui::GestureEvent* event) { 826 ui::GestureEvent* event) {
827 DCHECK(window_->IsVisible()); 827 DCHECK(window_->IsVisible());
828 return delegate_->OnGestureEvent(*event); 828 return delegate_->OnGestureEvent(*event);
829 } 829 }
830 830
831 bool NativeWidgetAura::CanFocus() { 831 bool NativeWidgetAura::CanFocus() {
832 return can_activate_; 832 return can_activate_;
833 } 833 }
834 834
835 void NativeWidgetAura::OnCaptureLost() { 835 void NativeWidgetAura::OnCaptureLost() {
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 return aura::Env::GetInstance()->is_mouse_button_down(); 1052 return aura::Env::GetInstance()->is_mouse_button_down();
1053 } 1053 }
1054 1054
1055 // static 1055 // static
1056 bool NativeWidgetPrivate::IsTouchDown() { 1056 bool NativeWidgetPrivate::IsTouchDown() {
1057 return aura::Env::GetInstance()->is_touch_down(); 1057 return aura::Env::GetInstance()->is_touch_down();
1058 } 1058 }
1059 1059
1060 } // namespace internal 1060 } // namespace internal
1061 } // namespace views 1061 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/native_widget_aura.h ('k') | ui/views/widget/native_widget_aura_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698