diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-07 00:58:52 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-07 00:58:52 +0000 |
| commit | 2f301674e584da1a4e6ba03178c29047a01d91bf (patch) | |
| tree | d95078a714f0fa9e233491642f42b50dcdc01d50 /ui | |
| parent | 8dc56d0f6ed6e59c93b20ef0d4cec99e411ed050 (diff) | |
| download | chromium_src-2f301674e584da1a4e6ba03178c29047a01d91bf.zip chromium_src-2f301674e584da1a4e6ba03178c29047a01d91bf.tar.gz chromium_src-2f301674e584da1a4e6ba03178c29047a01d91bf.tar.bz2 | |
Consolidate SDK forwards in sdk_forward_declarations.h.
BUG=none
TEST=none
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/322623002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm | 23 | ||||
| -rw-r--r-- | ui/message_center/cocoa/popup_controller.mm | 7 |
2 files changed, 1 insertions, 29 deletions
diff --git a/ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm b/ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm index b8d2da8..b855ee0 100644 --- a/ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm +++ b/ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm @@ -7,28 +7,7 @@ #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/mac/scoped_nsobject.h" - -#if !defined(MAC_OS_X_VERSION_10_7) || \ - MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 - -enum { - NSEventPhaseNone = 0, - NSEventPhaseBegan = 0x1 << 0, - NSEventPhaseStationary = 0x1 << 1, - NSEventPhaseChanged = 0x1 << 2, - NSEventPhaseEnded = 0x1 << 3, - NSEventPhaseCancelled = 0x1 << 4, -}; -typedef NSUInteger NSEventPhase; - -@interface NSEvent (LionAPI) - -- (NSEventPhase)momentumPhase; -- (NSEventPhase)phase; - -@end - -#endif // 10.7 +#include "base/mac/sdk_forward_declarations.h" @interface InvisibleScroller : NSScroller; @end diff --git a/ui/message_center/cocoa/popup_controller.mm b/ui/message_center/cocoa/popup_controller.mm index 30badc7..0f22937 100644 --- a/ui/message_center/cocoa/popup_controller.mm +++ b/ui/message_center/cocoa/popup_controller.mm @@ -13,13 +13,6 @@ #import "ui/message_center/cocoa/popup_collection.h" #include "ui/message_center/message_center.h" -#if !defined(MAC_OS_X_VERSION_10_7) || \ - MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 -enum { - NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8 -}; -#endif // MAC_OS_X_VERSION_10_7 - //////////////////////////////////////////////////////////////////////////////// @interface MCPopupController (Private) |