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

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

Issue 387020: Upstreaming WebKit.gyp (Closed)
Patch Set: Created 11 years, 1 month 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
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "chrome/browser/renderer_host/render_widget_host_view_mac.h" 5 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h"
6 6
7 #include "base/histogram.h" 7 #include "base/histogram.h"
8 #import "base/scoped_nsobject.h" 8 #import "base/scoped_nsobject.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/sys_string_conversions.h" 10 #include "base/sys_string_conversions.h"
11 #include "chrome/browser/browser_trial.h" 11 #include "chrome/browser/browser_trial.h"
12 #import "chrome/browser/cocoa/rwhvm_editcommand_helper.h" 12 #import "chrome/browser/cocoa/rwhvm_editcommand_helper.h"
13 #include "chrome/browser/renderer_host/backing_store.h" 13 #include "chrome/browser/renderer_host/backing_store.h"
14 #include "chrome/browser/renderer_host/render_process_host.h" 14 #include "chrome/browser/renderer_host/render_process_host.h"
15 #include "chrome/browser/renderer_host/render_widget_host.h" 15 #include "chrome/browser/renderer_host/render_widget_host.h"
16 #include "chrome/browser/spellchecker_platform_engine.h" 16 #include "chrome/browser/spellchecker_platform_engine.h"
17 #include "chrome/common/native_web_keyboard_event.h" 17 #include "chrome/common/native_web_keyboard_event.h"
18 #include "chrome/common/edit_command.h" 18 #include "chrome/common/edit_command.h"
19 #include "chrome/common/render_messages.h" 19 #include "chrome/common/render_messages.h"
20 #include "skia/ext/platform_canvas.h" 20 #include "skia/ext/platform_canvas.h"
21 #include "webkit/api/public/mac/WebInputEventFactory.h" 21 #include "third_party/WebKit/WebKit/chromium/public/mac/WebInputEventFactory.h"
22 #include "webkit/api/public/WebInputEvent.h" 22 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
23 #include "webkit/glue/webmenurunner_mac.h" 23 #include "webkit/glue/webmenurunner_mac.h"
24 24
25 using WebKit::WebInputEvent; 25 using WebKit::WebInputEvent;
26 using WebKit::WebInputEventFactory; 26 using WebKit::WebInputEventFactory;
27 using WebKit::WebMouseEvent; 27 using WebKit::WebMouseEvent;
28 using WebKit::WebMouseWheelEvent; 28 using WebKit::WebMouseWheelEvent;
29 29
30 static inline int ToWebKitModifiers(NSUInteger flags) { 30 static inline int ToWebKitModifiers(NSUInteger flags) {
31 int modifiers = 0; 31 int modifiers = 0;
32 if (flags & NSControlKeyMask) modifiers |= WebInputEvent::ControlKey; 32 if (flags & NSControlKeyMask) modifiers |= WebInputEvent::ControlKey;
(...skipping 1306 matching lines...) Expand 10 before | Expand all | Expand 10 after
1339 base::Time::Now().ToDoubleT()); 1339 base::Time::Now().ToDoubleT());
1340 renderWidgetHostView_->render_widget_host_->ForwardKeyboardEvent(event); 1340 renderWidgetHostView_->render_widget_host_->ForwardKeyboardEvent(event);
1341 } else { 1341 } else {
1342 renderWidgetHostView_->render_widget_host_->ImeConfirmComposition( 1342 renderWidgetHostView_->render_widget_host_->ImeConfirmComposition(
1343 UTF8ToUTF16([im_text UTF8String])); 1343 UTF8ToUTF16([im_text UTF8String]));
1344 } 1344 }
1345 renderWidgetHostView_->im_composing_ = false; 1345 renderWidgetHostView_->im_composing_ = false;
1346 } 1346 }
1347 1347
1348 @end 1348 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698