Remove all the OS X 10.6 SDK forward declarations.

BUG=137676
TEST=compiles
TBR=mechanical change

Review URL: https://chromiumcodereview.appspot.com/10785047

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147318 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 1 insertions, 92 deletions

diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 9d89ead..8e3a4c0 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -82,16 +82,6 @@ using content::BrowserThread;
 using content::DownloadManager;
 using content::UserMetricsAction;
 
-// 10.6 adds a public API for the Spotlight-backed search menu item in the Help
-// menu.  Provide the declaration so it can be called below when building with
-// the 10.5 SDK.
-#if !defined(MAC_OS_X_VERSION_10_6) || \
-    MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
-@interface NSApplication (SnowLeopardSDKDeclarations)
-- (void)setHelpMenu:(NSMenu*)helpMenu;
-@end
-#endif
-
 namespace {
 
 // Declare notification names from the 10.7 SDK.
diff --git a/chrome/browser/mac/security_wrappers.h b/chrome/browser/mac/security_wrappers.h
index 22d05db..28cd75a 100644
--- a/chrome/browser/mac/security_wrappers.h
+++ b/chrome/browser/mac/security_wrappers.h
@@ -6,27 +6,12 @@
 #define CHROME_BROWSER_MAC_SECURITY_WRAPPERS_H_
 
 #include <Security/Security.h>
+#include <Security/SecRequirement.h>
 
 #include "base/basictypes.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_ptr.h"
 
-#if defined(MAC_OS_X_VERSION_10_6) && \
-    MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
-
-#include <Security/SecRequirement.h>
-
-#else
-
-typedef struct __SecRequirement* SecRequirementRef;
-typedef uint32_t SecCSFlags;
-
-enum {
-  kSecCSDefaultFlags = 0
-};
-
-#endif
-
 namespace chrome {
 namespace browser {
 namespace mac {
diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
index b5e7f9b..d32cba6 100644
--- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
+++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
@@ -6,7 +6,6 @@
 
 #include <cmath>
 
-#include "base/mac/closure_blocks_leopard_compat.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/prefs/pref_service.h"
diff --git a/chrome/browser/ui/cocoa/base_bubble_controller.mm b/chrome/browser/ui/cocoa/base_bubble_controller.mm
index fc6738a..431c055 100644
--- a/chrome/browser/ui/cocoa/base_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/base_bubble_controller.mm
@@ -6,7 +6,6 @@
 
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
-#include "base/mac/closure_blocks_leopard_compat.h"
 #include "base/mac/mac_util.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/string_util.h"
@@ -24,28 +23,6 @@
                     userGesture:(bool)wasUserGesture;
 @end
 
-#if !defined(MAC_OS_X_VERSION_10_6) || \
-    MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
-typedef unsigned long long NSEventMask;
-
-@interface NSEvent (SnowLeopardDeclarations)
-+ (id)addLocalMonitorForEventsMatchingMask:(NSEventMask)mask
-                                   handler:(NSEvent* (^)(NSEvent*))block;
-+ (void)removeMonitor:(id)eventMonitor;
-@end
-
-@interface NSOperationQueue (SnowLeopardDeclarations)
-+ (id)mainQueue;
-@end
-
-@interface NSNotificationCenter (SnowLeopardDeclarations)
-- (id)addObserverForName:(NSString*)name
-                  object:(id)obj
-                   queue:(NSOperationQueue*)queue
-              usingBlock:(void (^)(NSNotification*))block;
-@end
-#endif  // MAC_OS_X_VERSION_10_6
-
 @implementation BaseBubbleController
 
 @synthesize parentWindow = parentWindow_;
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
index 6699495..51541f5 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -44,21 +44,6 @@
 using content::RenderWidgetHostView;
 using content::WebContents;
 
-// Forward-declare symbols that are part of the 10.6 SDK.
-#if !defined(MAC_OS_X_VERSION_10_6) || \
-    MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
-
-enum {
-  NSApplicationPresentationDefault                    = 0,
-  NSApplicationPresentationAutoHideDock               = (1 <<  0),
-  NSApplicationPresentationHideDock                   = (1 <<  1),
-  NSApplicationPresentationAutoHideMenuBar            = (1 <<  2),
-  NSApplicationPresentationHideMenuBar                = (1 <<  3),
-};
-typedef NSUInteger NSApplicationPresentationOptions;
-
-#endif  // MAC_OS_X_VERSION_10_6
-
 namespace {
 
 // Space between the incognito badge and the right edge of the window.
diff --git a/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.mm b/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.mm
index e889b41..479114c 100644
--- a/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/extensions/shell_window_cocoa.mm
@@ -19,15 +19,6 @@
 - (void)setBottomCornerRounded:(BOOL)rounded;
 @end
 
-#if !defined(MAC_OS_X_VERSION_10_6) || \
-    MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
-
-@interface NSWindow (SnowLeopardSDKDeclarations)
-- (void)setStyleMask:(NSUInteger)styleMask;
-@end
-
-#endif  // MAC_OS_X_VERSION_10_6
-
 // Replicate specific 10.7 SDK declarations for building with prior SDKs.
 #if !defined(MAC_OS_X_VERSION_10_7) || \
     MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
diff --git a/chrome/browser/ui/panels/panel_window_controller_cocoa.mm b/chrome/browser/ui/panels/panel_window_controller_cocoa.mm
index 72c8825..c86cf9f6 100644
--- a/chrome/browser/ui/panels/panel_window_controller_cocoa.mm
+++ b/chrome/browser/ui/panels/panel_window_controller_cocoa.mm
@@ -54,16 +54,6 @@ const double kWidthOfMouseResizeArea = 4.0;
 // down before panel resizing operation actually starts.
 const double kDragThreshold = 3.0;
 
-// Replicate specific 10.6 SDK declarations for building with prior SDKs.
-#if !defined(MAC_OS_X_VERSION_10_6) || \
-    MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
-
-enum {
-  NSWindowCollectionBehaviorParticipatesInCycle = 1 << 5
-};
-
-#endif  // MAC_OS_X_VERSION_10_6
-
 @interface PanelWindowControllerCocoa (PanelsCanBecomeKey)
 // Internal helper method for extracting the total number of panel windows
 // from the panel manager. Used to decide if panel can become the key window.
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index b5c1d8f..fd169cd 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -5039,7 +5039,6 @@
             ],
           },
           'dependencies': [
-            '../base/base.gyp:closure_blocks_leopard_compat',
             '../third_party/icon_family/icon_family.gyp:icon_family',
           ],
           'actions': [
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 980ccb9..59fca7b 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2280,7 +2280,6 @@
            # exist on disk so it can pull from it.
           'dependencies': [
             'chrome',
-            '../base/base.gyp:closure_blocks_leopard_compat',
             '../third_party/ocmock/ocmock.gyp:ocmock',
           ],
           'include_dirs': [
diff --git a/chrome/common/chrome_paths_mac.mm b/chrome/common/chrome_paths_mac.mm
index ea033c5..7745be8 100644
--- a/chrome/common/chrome_paths_mac.mm
+++ b/chrome/common/chrome_paths_mac.mm
@@ -19,12 +19,6 @@
 
 namespace {
 
-// TODO(thestig) Remove this once we switch to the 10.6 SDK.
-#if !defined(MAC_OS_X_VERSION_10_6) || \
-    MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
-#define NSPicturesDirectory 19
-#endif
-
 const FilePath* g_override_versioned_directory = NULL;
 
 // Return a retained (NOT autoreleased) NSBundle* as the internal