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

Side by Side Diff: content/child/npapi/plugin_web_event_converter_mac.mm

Issue 1544273002: Switch to standard integer types in content/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « content/child/npapi/plugin_web_event_converter_mac.h ('k') | content/child/npapi/webplugin.h » ('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 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 #include <string.h>
6 7
7 #include "base/logging.h" 8 #include "base/logging.h"
8 #include "content/child/npapi/plugin_web_event_converter_mac.h" 9 #include "content/child/npapi/plugin_web_event_converter_mac.h"
9 #include "third_party/WebKit/public/web/WebInputEvent.h" 10 #include "third_party/WebKit/public/web/WebInputEvent.h"
10 11
11 using blink::WebInputEvent; 12 using blink::WebInputEvent;
12 using blink::WebKeyboardEvent; 13 using blink::WebKeyboardEvent;
13 using blink::WebMouseEvent; 14 using blink::WebMouseEvent;
14 using blink::WebMouseWheelEvent; 15 using blink::WebMouseWheelEvent;
15 16
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 if (web_event.modifiers & WebInputEvent::AltKey) 180 if (web_event.modifiers & WebInputEvent::AltKey)
180 modifiers |= NSAlternateKeyMask; 181 modifiers |= NSAlternateKeyMask;
181 if (web_event.modifiers & WebInputEvent::MetaKey) 182 if (web_event.modifiers & WebInputEvent::MetaKey)
182 modifiers |= NSCommandKeyMask; 183 modifiers |= NSCommandKeyMask;
183 if (CapsLockIsActive(web_event)) 184 if (CapsLockIsActive(web_event))
184 modifiers |= NSAlphaShiftKeyMask; 185 modifiers |= NSAlphaShiftKeyMask;
185 return modifiers; 186 return modifiers;
186 } 187 }
187 188
188 } // namespace content 189 } // namespace content
OLDNEW
« no previous file with comments | « content/child/npapi/plugin_web_event_converter_mac.h ('k') | content/child/npapi/webplugin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698