Commit 2eb8bf2d authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot

Remove dead Mac code.

No longer needed since Mac builds are targeting 10.9.

Change-Id: I2ff87eda6ba3f9af5c2ae3d9cdd034791542b7cf
Reviewed-on: https://chromium-review.googlesource.com/686295Reviewed-by: default avatarRobert Sesek <rsesek@chromium.org>
Reviewed-by: default avatarSadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Reviewed-by: default avatarGiovanni Ortuño Urquidi <ortuno@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505280}
parent d8320f4b
...@@ -300,10 +300,7 @@ config("executable_config") { ...@@ -300,10 +300,7 @@ config("executable_config") {
# Currently only turn on linker CFI for executables. # Currently only turn on linker CFI for executables.
configs += [ "//build/config/win:cfi_linker" ] configs += [ "//build/config/win:cfi_linker" ]
} else if (is_mac) { } else if (is_mac) {
configs += [ configs += [ "//build/config/mac:mac_dynamic_flags" ]
"//build/config/mac:mac_dynamic_flags",
"//build/config/mac:mac_executable_flags",
]
} else if (is_ios) { } else if (is_ios) {
configs += [ configs += [
"//build/config/ios:ios_dynamic_flags", "//build/config/ios:ios_dynamic_flags",
......
...@@ -82,12 +82,6 @@ config("mac_dynamic_flags") { ...@@ -82,12 +82,6 @@ config("mac_dynamic_flags") {
} }
} }
# On Mac, this is used only for executables.
config("mac_executable_flags") {
# Remove this when targeting >=10.7 since it is the default in that config.
ldflags = [ "-Wl,-pie" ] # Position independent.
}
# The ldflags referenced below are handled by # The ldflags referenced below are handled by
# //build/toolchain/mac/linker_driver.py. # //build/toolchain/mac/linker_driver.py.
# Remove this config if a target wishes to change the arguments passed to the # Remove this config if a target wishes to change the arguments passed to the
......
...@@ -23,17 +23,6 @@ ...@@ -23,17 +23,6 @@
#include "chrome/common/mac/mock_launchd.h" #include "chrome/common/mac/mock_launchd.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
// Once Chrome no longer supports OSX 10.7, everything within this
// preprocessor block can be removed.
#if !defined(MAC_OS_X_VERSION_10_8) || \
MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_8
@interface NSFileManager (Chrome)
- (BOOL)trashItemAtURL:(NSURL*)url
resultingItemURL:(NSURL* __nullable* __nullable)outResultingURL
error:(NSError**)error;
@end
#endif
class ServiceProcessStateFileManipulationTest : public ::testing::Test { class ServiceProcessStateFileManipulationTest : public ::testing::Test {
public: public:
void TrashFunc(const base::FilePath& src) { void TrashFunc(const base::FilePath& src) {
......
...@@ -146,9 +146,6 @@ static void unmount_callback(DADiskRef disk, ...@@ -146,9 +146,6 @@ static void unmount_callback(DADiskRef disk,
- (void)didFinishEjectingDisk:(DADiskRef)disk - (void)didFinishEjectingDisk:(DADiskRef)disk
withDissenter:(DADissenterRef)dissenter { withDissenter:(DADissenterRef)dissenter {
DASessionSetDispatchQueue(session_, NULL); DASessionSetDispatchQueue(session_, NULL);
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_8
dispatch_release(unpack_dq_);
#endif
CFRelease(session_); CFRelease(session_);
NSError* error = nil; NSError* error = nil;
if (dissenter) { if (dissenter) {
...@@ -167,4 +164,4 @@ static void unmount_callback(DADiskRef disk, ...@@ -167,4 +164,4 @@ static void unmount_callback(DADiskRef disk,
} }
} }
@end @end
\ No newline at end of file
...@@ -21,12 +21,6 @@ ...@@ -21,12 +21,6 @@
#include "build/build_config.h" #include "build/build_config.h"
#include "components/crash/core/common/crash_keys.h" #include "components/crash/core/common/crash_keys.h"
#if !defined(OS_IOS) && (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_6)
// Apparently objc/runtime.h doesn't define this with the 10.6 SDK yet.
// The docs say it exists since 10.6 however.
OBJC_EXPORT void *objc_destructInstance(id obj);
#endif
// Deallocated objects are re-classed as |CrZombie|. No superclass // Deallocated objects are re-classed as |CrZombie|. No superclass
// because then the class would have to override many/most of the // because then the class would have to override many/most of the
// inherited methods (|NSObject| is like a category magnet!). // inherited methods (|NSObject| is like a category magnet!).
......
...@@ -53,13 +53,6 @@ ...@@ -53,13 +53,6 @@
channel_->OnChannelClosed(l2capChannel); channel_->OnChannelClosed(l2capChannel);
} }
// These methods are marked as optional in the 10.8 SDK, but not in the 10.6
// SDK. These empty implementations can be removed once we drop the 10.6 SDK.
- (void)l2capChannelReconfigured:(IOBluetoothL2CAPChannel*)l2capChannel {
}
- (void)l2capChannelQueueSpaceAvailable:(IOBluetoothL2CAPChannel*)l2capChannel {
}
@end @end
namespace device { namespace device {
......
...@@ -33,15 +33,6 @@ ...@@ -33,15 +33,6 @@
#include "net/base/io_buffer.h" #include "net/base/io_buffer.h"
#include "net/base/net_errors.h" #include "net/base/net_errors.h"
#if !defined(MAC_OS_X_VERSION_10_7) || \
MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7
@interface IOBluetoothDevice (LionSDKDeclarations)
- (IOReturn)performSDPQuery:(id)target uuids:(NSArray*)uuids;
@end
#endif // MAC_OS_X_VERSION_10_7
using device::BluetoothSocket; using device::BluetoothSocket;
// A simple helper class that forwards SDP query completed notifications to its // A simple helper class that forwards SDP query completed notifications to its
......
...@@ -22,33 +22,6 @@ ...@@ -22,33 +22,6 @@
#include "ui/gl/ca_renderer_layer_params.h" #include "ui/gl/ca_renderer_layer_params.h"
#include "ui/gl/gl_image_io_surface.h" #include "ui/gl/gl_image_io_surface.h"
#if !defined(MAC_OS_X_VERSION_10_8) || \
MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_8
extern NSString* const AVLayerVideoGravityResize;
extern "C" void NSAccessibilityPostNotificationWithUserInfo(
id object,
NSString* notification,
NSDictionary* user_info);
extern "C" OSStatus CMSampleBufferCreateForImageBuffer(
CFAllocatorRef,
CVImageBufferRef,
Boolean dataReady,
CMSampleBufferMakeDataReadyCallback,
void*,
CMVideoFormatDescriptionRef,
const CMSampleTimingInfo*,
CMSampleBufferRef*);
extern "C" CFArrayRef CMSampleBufferGetSampleAttachmentsArray(CMSampleBufferRef,
Boolean);
extern "C" OSStatus CMVideoFormatDescriptionCreateForImageBuffer(
CFAllocatorRef,
CVImageBufferRef,
CMVideoFormatDescriptionRef*);
extern "C" CMTime CMTimeMake(int64_t, int32_t);
extern CFStringRef const kCMSampleAttachmentKey_DisplayImmediately;
extern const CMTime kCMTimeInvalid;
#endif // MAC_OS_X_VERSION_10_8
namespace ui { namespace ui {
namespace { namespace {
......
...@@ -17,17 +17,6 @@ ...@@ -17,17 +17,6 @@
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/threading/thread_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h"
// This method exists on NSWindowDelegate on 10.7+.
// To build on 10.6, we just need to declare it somewhere. We'll test
// -[NSObject respondsToSelector] before calling it.
#if !defined(MAC_OS_X_VERSION_10_7) || \
MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7
@protocol NSWindowDelegateLion
- (NSSize)window:(NSWindow*)window
willUseFullScreenContentSize:(NSSize)proposedSize;
@end
#endif
// Donates a testing implementation of [NSWindow toggleFullScreen:]. // Donates a testing implementation of [NSWindow toggleFullScreen:].
@interface ToggleFullscreenDonorForWindow : NSObject @interface ToggleFullscreenDonorForWindow : NSObject
@end @end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment