diff options
| -rw-r--r-- | base/base.gypi | 3 | ||||
| -rw-r--r-- | chrome/browser/idle_mac.mm | 6 | ||||
| -rw-r--r-- | skia/skia.gyp | 6 | ||||
| -rw-r--r-- | ui/gfx/rect.cc | 2 | ||||
| -rw-r--r-- | ui/gfx/size.cc | 2 |
5 files changed, 5 insertions, 14 deletions
diff --git a/base/base.gypi b/base/base.gypi index 5a4362d..c1962e1 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -482,9 +482,6 @@ 'msvs_disabled_warnings': [ 4244, 4554, 4018, 4102, ], - 'mac_framework_dirs': [ - '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks', - ], 'target_conditions': [ ['<(use_glib)==0 or >(nacl_untrusted_build)==1', { 'sources/': [ diff --git a/chrome/browser/idle_mac.mm b/chrome/browser/idle_mac.mm index 481bc37..8547ff5 100644 --- a/chrome/browser/idle_mac.mm +++ b/chrome/browser/idle_mac.mm @@ -1,11 +1,11 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/idle.h" +#include "chrome/browser/idle.h" +#include <ApplicationServices/ApplicationServices.h> #import <Cocoa/Cocoa.h> -#import <CoreGraphics/CGEventSource.h> @interface MacScreenMonitor : NSObject { @private diff --git a/skia/skia.gyp b/skia/skia.gyp index e2ac103..77abee5 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -789,9 +789,6 @@ '../third_party/skia/src/utils', ], 'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4800], - 'mac_framework_dirs': [ - '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks', - ], 'defines': [ 'SK_BUILD_NO_IMAGE_ENCODE', 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"', @@ -1056,9 +1053,6 @@ '../third_party/skia/include/utils', 'ext', ], - 'mac_framework_dirs': [ - '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks', - ], 'defines': [ 'SK_BUILD_NO_IMAGE_ENCODE', 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"', diff --git a/ui/gfx/rect.cc b/ui/gfx/rect.cc index 487b648..300b8ad 100644 --- a/ui/gfx/rect.cc +++ b/ui/gfx/rect.cc @@ -7,7 +7,7 @@ #if defined(OS_WIN) #include <windows.h> #elif defined(OS_MACOSX) -#include <CoreGraphics/CGGeometry.h> +#include <ApplicationServices/ApplicationServices.h> #elif defined(TOOLKIT_GTK) #include <gdk/gdk.h> #endif diff --git a/ui/gfx/size.cc b/ui/gfx/size.cc index 303559d..351dcae 100644 --- a/ui/gfx/size.cc +++ b/ui/gfx/size.cc @@ -7,7 +7,7 @@ #if defined(OS_WIN) #include <windows.h> #elif defined(OS_MACOSX) -#include <CoreGraphics/CGGeometry.h> +#include <ApplicationServices/ApplicationServices.h> #endif #include "base/logging.h" |