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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 9549020: Improve switch between gestures and touch mode when kEnableTouchEvents (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: simplify a bit Created 8 years, 9 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
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 "content/browser/renderer_host/render_widget_host_view_mac.h" 5 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
6 6
7 #include <QuartzCore/QuartzCore.h> 7 #include <QuartzCore/QuartzCore.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 1020 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 1031
1032 void RenderWidgetHostViewMac::ForceTextureReload() { 1032 void RenderWidgetHostViewMac::ForceTextureReload() {
1033 plugin_container_manager_.ForceTextureReload(); 1033 plugin_container_manager_.ForceTextureReload();
1034 } 1034 }
1035 1035
1036 void RenderWidgetHostViewMac::UnhandledWheelEvent( 1036 void RenderWidgetHostViewMac::UnhandledWheelEvent(
1037 const WebKit::WebMouseWheelEvent& event) { 1037 const WebKit::WebMouseWheelEvent& event) {
1038 [cocoa_view_ gotUnhandledWheelEvent]; 1038 [cocoa_view_ gotUnhandledWheelEvent];
1039 } 1039 }
1040 1040
1041 void RenderWidgetHostViewMac::ProcessTouchAck(bool processed) { 1041 void RenderWidgetHostViewMac::ProcessTouchAck(
1042 WebKit::WebInputEvent::Type type, bool processed) {
1042 } 1043 }
1043 1044
1044 void RenderWidgetHostViewMac::SetHasHorizontalScrollbar( 1045 void RenderWidgetHostViewMac::SetHasHorizontalScrollbar(
1045 bool has_horizontal_scrollbar) { 1046 bool has_horizontal_scrollbar) {
1046 [cocoa_view_ setHasHorizontalScrollbar:has_horizontal_scrollbar]; 1047 [cocoa_view_ setHasHorizontalScrollbar:has_horizontal_scrollbar];
1047 } 1048 }
1048 1049
1049 void RenderWidgetHostViewMac::SetScrollOffsetPinning( 1050 void RenderWidgetHostViewMac::SetScrollOffsetPinning(
1050 bool is_pinned_to_left, bool is_pinned_to_right) { 1051 bool is_pinned_to_left, bool is_pinned_to_right) {
1051 [cocoa_view_ scrollOffsetPinnedToLeft:is_pinned_to_left 1052 [cocoa_view_ scrollOffsetPinnedToLeft:is_pinned_to_left
(...skipping 1715 matching lines...) Expand 10 before | Expand all | Expand 10 after
2767 if (!string) return NO; 2768 if (!string) return NO;
2768 2769
2769 // If the user is currently using an IME, confirm the IME input, 2770 // If the user is currently using an IME, confirm the IME input,
2770 // and then insert the text from the service, the same as TextEdit and Safari. 2771 // and then insert the text from the service, the same as TextEdit and Safari.
2771 [self confirmComposition]; 2772 [self confirmComposition];
2772 [self insertText:string]; 2773 [self insertText:string];
2773 return YES; 2774 return YES;
2774 } 2775 }
2775 2776
2776 @end 2777 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698