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

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

Issue 10785047: Remove all the OS X 10.6 SDK forward declarations. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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 | « chrome/common/chrome_paths_mac.mm ('k') | content/content_browser.gypi » ('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 "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"
11 #include "base/debug/trace_event.h" 11 #include "base/debug/trace_event.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/mac/closure_blocks_leopard_compat.h"
14 #include "base/mac/mac_util.h" 13 #include "base/mac/mac_util.h"
15 #include "base/mac/scoped_cftyperef.h" 14 #include "base/mac/scoped_cftyperef.h"
16 #import "base/mac/scoped_nsautorelease_pool.h" 15 #import "base/mac/scoped_nsautorelease_pool.h"
17 #import "base/memory/scoped_nsobject.h" 16 #import "base/memory/scoped_nsobject.h"
18 #include "base/message_loop.h" 17 #include "base/message_loop.h"
19 #include "base/metrics/histogram.h" 18 #include "base/metrics/histogram.h"
20 #include "base/string_util.h" 19 #include "base/string_util.h"
21 #include "base/sys_info.h" 20 #include "base/sys_info.h"
22 #include "base/sys_string_conversions.h" 21 #include "base/sys_string_conversions.h"
23 #include "base/utf_string_conversions.h" 22 #include "base/utf_string_conversions.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 using content::RenderViewHostImpl; 58 using content::RenderViewHostImpl;
60 using content::RenderWidgetHost; 59 using content::RenderWidgetHost;
61 using content::RenderWidgetHostImpl; 60 using content::RenderWidgetHostImpl;
62 using content::RenderWidgetHostView; 61 using content::RenderWidgetHostView;
63 using WebKit::WebInputEvent; 62 using WebKit::WebInputEvent;
64 using WebKit::WebInputEventFactory; 63 using WebKit::WebInputEventFactory;
65 using WebKit::WebMouseEvent; 64 using WebKit::WebMouseEvent;
66 using WebKit::WebMouseWheelEvent; 65 using WebKit::WebMouseWheelEvent;
67 using WebKit::WebGestureEvent; 66 using WebKit::WebGestureEvent;
68 67
69 // Declare things that are part of the 10.6 SDK.
70 #if !defined(MAC_OS_X_VERSION_10_6) || \
71 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
72 enum {
73 NSEventTypeBeginGesture = 19,
74 NSEventTypeEndGesture = 20
75 };
76
77 enum {
78 NSEventMaskBeginGesture = 1 << NSEventTypeBeginGesture,
79 NSEventMaskEndGesture = 1 << NSEventTypeEndGesture,
80 };
81
82 typedef unsigned long long NSEventMask;
83
84 @class NSTextInputContext;
85 @interface NSResponder (AppKitDetails)
86 - (NSTextInputContext*)inputContext;
87 @end
88 #endif // 10.6
89
90 // Declare things that are part of the 10.7 SDK. 68 // Declare things that are part of the 10.7 SDK.
91 #if !defined(MAC_OS_X_VERSION_10_7) || \ 69 #if !defined(MAC_OS_X_VERSION_10_7) || \
92 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 70 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
93 @interface NSEvent (LionAPI) 71 @interface NSEvent (LionAPI)
94 + (id)addLocalMonitorForEventsMatchingMask:(NSEventMask)mask 72 + (id)addLocalMonitorForEventsMatchingMask:(NSEventMask)mask
95 handler:(NSEvent* (^)(NSEvent*))block; 73 handler:(NSEvent* (^)(NSEvent*))block;
96 + (void)removeMonitor:(id)eventMonitor; 74 + (void)removeMonitor:(id)eventMonitor;
97 @end 75 @end
98 76
99 @interface NSScreen (LionAPI) 77 @interface NSScreen (LionAPI)
(...skipping 2992 matching lines...) Expand 10 before | Expand all | Expand 10 after
3092 if (!string) return NO; 3070 if (!string) return NO;
3093 3071
3094 // If the user is currently using an IME, confirm the IME input, 3072 // If the user is currently using an IME, confirm the IME input,
3095 // and then insert the text from the service, the same as TextEdit and Safari. 3073 // and then insert the text from the service, the same as TextEdit and Safari.
3096 [self confirmComposition]; 3074 [self confirmComposition];
3097 [self insertText:string]; 3075 [self insertText:string];
3098 return YES; 3076 return YES;
3099 } 3077 }
3100 3078
3101 @end 3079 @end
OLDNEW
« no previous file with comments | « chrome/common/chrome_paths_mac.mm ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698