Remove 10.8 foundation_util workaround

This commit is contained in:
Kevin Sawicki 2017-05-18 13:54:11 -07:00
parent c6190dc094
commit 6e3a0b50cc
4 changed files with 2 additions and 18 deletions

View file

@ -1,6 +1,6 @@
#import "common/application_info.h"
#import "common/mac/foundation_util.h"
#import "base/mac/foundation_util.h"
#import "common/mac/main_application_bundle.h"
#import "base/strings/sys_string_conversions.h"

View file

@ -1,15 +0,0 @@
#ifndef BRIGHTRAY_COMMON_MAC_FOUNDATION_UTIL_H_
#define BRIGHTRAY_COMMON_MAC_FOUNDATION_UTIL_H_
// This header exists to work around incompatibilities between
// base/mac/foundation_util.h and the 10.8 SDK.
#import <Foundation/Foundation.h>
// base/mac/foundation_util.h contains an incompatible declaration of
// NSSearchPathDirectory, so here we #define it to be something else.
#define NSSearchPathDirectory NSSearchPathDirectory___PRE_10_8
#import "base/mac/foundation_util.h"
#undef NSSearchPathDirectory
#endif

View file

@ -5,8 +5,8 @@
#import "main_delegate.h"
#include "base/mac/foundation_util.h"
#include "common/application_info.h"
#include "common/mac/foundation_util.h"
#include "common/mac/main_application_bundle.h"
#include "base/command_line.h"

View file

@ -114,7 +114,6 @@
'common/application_info_win.cc',
'common/content_client.cc',
'common/content_client.h',
'common/mac/foundation_util.h',
'common/mac/main_application_bundle.h',
'common/mac/main_application_bundle.mm',
'common/main_delegate.cc',