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

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

Issue 11028144: touch: Cleanup touch-event mode switching on windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 1300 matching lines...) Expand 10 before | Expand all | Expand 10 after
1311 glMatrixMode(GL_MODELVIEW); 1311 glMatrixMode(GL_MODELVIEW);
1312 glLoadIdentity(); 1312 glLoadIdentity();
1313 1313
1314 plugin_container_manager_.Draw(context, plugin_handle); 1314 plugin_container_manager_.Draw(context, plugin_handle);
1315 } 1315 }
1316 1316
1317 void RenderWidgetHostViewMac::ForceTextureReload() { 1317 void RenderWidgetHostViewMac::ForceTextureReload() {
1318 plugin_container_manager_.ForceTextureReload(); 1318 plugin_container_manager_.ForceTextureReload();
1319 } 1319 }
1320 1320
1321 void RenderWidgetHostViewMac::ProcessTouchAck( 1321 void RenderWidgetHostViewMac::ProcessTouchAck(bool processed) {
1322 WebKit::WebInputEvent::Type type, bool processed) {
1323 } 1322 }
1324 1323
1325 void RenderWidgetHostViewMac::SetHasHorizontalScrollbar( 1324 void RenderWidgetHostViewMac::SetHasHorizontalScrollbar(
1326 bool has_horizontal_scrollbar) { 1325 bool has_horizontal_scrollbar) {
1327 [cocoa_view_ setHasHorizontalScrollbar:has_horizontal_scrollbar]; 1326 [cocoa_view_ setHasHorizontalScrollbar:has_horizontal_scrollbar];
1328 } 1327 }
1329 1328
1330 void RenderWidgetHostViewMac::SetScrollOffsetPinning( 1329 void RenderWidgetHostViewMac::SetScrollOffsetPinning(
1331 bool is_pinned_to_left, bool is_pinned_to_right) { 1330 bool is_pinned_to_left, bool is_pinned_to_right) {
1332 [cocoa_view_ scrollOffsetPinnedToLeft:is_pinned_to_left 1331 [cocoa_view_ scrollOffsetPinnedToLeft:is_pinned_to_left
(...skipping 1967 matching lines...) Expand 10 before | Expand all | Expand 10 after
3300 if (!string) return NO; 3299 if (!string) return NO;
3301 3300
3302 // If the user is currently using an IME, confirm the IME input, 3301 // If the user is currently using an IME, confirm the IME input,
3303 // and then insert the text from the service, the same as TextEdit and Safari. 3302 // and then insert the text from the service, the same as TextEdit and Safari.
3304 [self confirmComposition]; 3303 [self confirmComposition];
3305 [self insertText:string]; 3304 [self insertText:string];
3306 return YES; 3305 return YES;
3307 } 3306 }
3308 3307
3309 @end 3308 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698