diff options
83 files changed, 320 insertions, 221 deletions
@@ -215,9 +215,9 @@ v8.log /third_party/gles2_conform /third_party/gnu_binutils/ /third_party/gold +/third_party/google_toolbox_for_mac/src /third_party/googlemac /third_party/gperf -/third_party/GTM /third_party/guava/src /third_party/httpcomponents-client /third_party/httpcomponents-core @@ -28,7 +28,7 @@ vars = { # After changing nacl_revision, run 'glient sync' and check native_client/DEPS # to update other nacl_*_revision's. "nacl_tools_revision": "12526", # native_client/DEPS: tools_rev - "gtm_revision": "616", + "google_toolbox_for_mac_revision": "616", "libaddressinput_revision": "176", "libphonenumber_revision": "621", "libvpx_revision": "240222", @@ -341,9 +341,9 @@ deps_os = { "/trunk/deps/third_party/nacl_sdk_binaries@111576", }, "ios": { - "src/third_party/GTM": + "src/third_party/google_toolbox_for_mac/src": (Var("googlecode_url") % "google-toolbox-for-mac") + "/trunk@" + - Var("gtm_revision"), + Var("google_toolbox_for_mac_revision"), "src/third_party/nss": "/trunk/deps/third_party/nss@" + Var("nss_revision"), @@ -399,11 +399,13 @@ deps_os = { "src/chrome/tools/test/reference_build/chrome_mac": "/trunk/deps/reference_builds/chrome_mac@237381", - "src/third_party/GTM": + "src/third_party/google_toolbox_for_mac/src": (Var("googlecode_url") % "google-toolbox-for-mac") + "/trunk@" + - Var("gtm_revision"), + Var("google_toolbox_for_mac_revision"), + "src/third_party/pdfsqueeze": (Var("googlecode_url") % "pdfsqueeze") + "/trunk@5", + "src/third_party/lighttpd": "/trunk/deps/third_party/lighttpd@" + Var("lighttpd_revision"), @@ -5,7 +5,7 @@ include_rules = [ "+third_party/apple_apsl", "+third_party/libevent", "+third_party/dmg_fp", - "+third_party/GTM", + "+third_party/google_toolbox_for_mac/src", "+third_party/mach_override", "+third_party/modp_b64", "+third_party/tcmalloc", diff --git a/base/mac/cocoa_protocols.h b/base/mac/cocoa_protocols.h index e83fcbb..f91c510 100644 --- a/base/mac/cocoa_protocols.h +++ b/base/mac/cocoa_protocols.h @@ -7,9 +7,9 @@ #import <Cocoa/Cocoa.h> -// GTM also maintinas a list of empty protocols, but only the ones the library +// GTM also maintains a list of empty protocols, but only the ones the library // requires. Augment that below. -#import "third_party/GTM/GTMDefines.h" +#import "third_party/google_toolbox_for_mac/src/GTMDefines.h" // New Mac OS X SDKs introduce new protocols used for delegates. These // protocol defintions aren't not present in earlier releases of the Mac OS X diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index 066bf28..4c0b02a 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -707,6 +707,9 @@ { 'target_name': 'breakpad_client', 'type': 'static_library', + 'dependencies': [ + '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', + ], 'sources': [ 'src/client/ios/Breakpad.h', 'src/client/ios/Breakpad.mm', @@ -756,24 +759,7 @@ 'src', 'src/client/mac/Framework', 'src/common/mac', - # For GTMLogger. - '<(DEPTH)/third_party/GTM', - '<(DEPTH)/third_party/GTM/Foundation', ], - 'link_settings': { - # Build the version of GTMLogger.m in third_party rather than the - # one in src/common/mac because the former catches all exceptions - # whereas the latter lets them propagate, which can cause odd - # crashes. - 'sources': [ - '<(DEPTH)/third_party/GTM/Foundation/GTMLogger.h', - '<(DEPTH)/third_party/GTM/Foundation/GTMLogger.m', - ], - 'include_dirs': [ - '<(DEPTH)/third_party/GTM', - '<(DEPTH)/third_party/GTM/Foundation', - ], - }, } ] }], diff --git a/chrome/DEPS b/chrome/DEPS index 8b0aa26..8b2c616 100644 --- a/chrome/DEPS +++ b/chrome/DEPS @@ -32,12 +32,12 @@ include_rules = [ "+third_party/WebKit/public/web", # Allow inclusion of third-party code: + "+third_party/google_toolbox_for_mac/src", "+third_party/hunspell", "+third_party/libxml", "+third_party/mozilla", # Mozilla interface headers. "+third_party/skia", "+third_party/zlib/google", - "+third_party/GTM", # Google Toolbox for Mac. "+ui", ] diff --git a/chrome/browser/service_process/service_process_control_mac.mm b/chrome/browser/service_process/service_process_control_mac.mm index fd40786..e7ae3b4 100644 --- a/chrome/browser/service_process/service_process_control_mac.mm +++ b/chrome/browser/service_process/service_process_control_mac.mm @@ -9,7 +9,7 @@ #include "base/mac/scoped_cftyperef.h" #include "chrome/common/service_process_util_posix.h" #include "content/public/browser/browser_thread.h" -#include "third_party/GTM/Foundation/GTMServiceManagement.h" +#include "third_party/google_toolbox_for_mac/src/Foundation/GTMServiceManagement.h" using content::BrowserThread; diff --git a/chrome/browser/themes/theme_service_mac.mm b/chrome/browser/themes/theme_service_mac.mm index 3644f1f..3c46912 100644 --- a/chrome/browser/themes/theme_service_mac.mm +++ b/chrome/browser/themes/theme_service_mac.mm @@ -10,7 +10,7 @@ #include "chrome/browser/themes/browser_theme_pack.h" #include "chrome/browser/themes/theme_properties.h" #include "skia/ext/skia_utils_mac.h" -#import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSColor+Luminance.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/cocoa/about_ipc_controller.h b/chrome/browser/ui/cocoa/about_ipc_controller.h index 30ce664..af78be7 100644 --- a/chrome/browser/ui/cocoa/about_ipc_controller.h +++ b/chrome/browser/ui/cocoa/about_ipc_controller.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "ipc/ipc_logging.h" #include "ipc/ipc_message_utils.h" -#include "third_party/GTM/Foundation/GTMRegex.h" +#include "third_party/google_toolbox_for_mac/src/Foundation/GTMRegex.h" // Must be included after IPC_MESSAGE_LOG_ENABLED gets defined #import "chrome/browser/ui/cocoa/about_ipc_dialog.h" diff --git a/chrome/browser/ui/cocoa/animatable_image.mm b/chrome/browser/ui/cocoa/animatable_image.mm index 9860e24..4af6be8 100644 --- a/chrome/browser/ui/cocoa/animatable_image.mm +++ b/chrome/browser/ui/cocoa/animatable_image.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/animatable_image.h" #include "base/logging.h" -#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" @implementation AnimatableImage diff --git a/chrome/browser/ui/cocoa/animatable_view.mm b/chrome/browser/ui/cocoa/animatable_view.mm index 74dc4b1..cb00e04 100644 --- a/chrome/browser/ui/cocoa/animatable_view.mm +++ b/chrome/browser/ui/cocoa/animatable_view.mm @@ -6,7 +6,7 @@ #import <QuartzCore/QuartzCore.h> #import "chrome/browser/ui/cocoa/animatable_view.h" -#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" // NSAnimation subclass that animates the height of an AnimatableView. Allows // the caller to start and cancel the animation as desired. diff --git a/chrome/browser/ui/cocoa/autofill/autofill_main_container.mm b/chrome/browser/ui/cocoa/autofill/autofill_main_container.mm index 76ca364..2cc062d 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_main_container.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_main_container.mm @@ -21,7 +21,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #import "ui/base/cocoa/controls/blue_label_button.h" #include "ui/base/cocoa/window_size_constants.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm index 3d6a25b..8f71bdc 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm @@ -8,8 +8,8 @@ #import "base/mac/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h" -#import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" -#import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSBezierPath+RoundRect.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSColor+Luminance.h" using bookmarks::kBookmarkBarMenuCornerRadius; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h index f5083d0..f997008 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h @@ -10,7 +10,7 @@ #import <Cocoa/Cocoa.h> -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" @class BookmarkBarController; @class BookmarkBarItemContainer; diff --git a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm index 0f635be..9b214e1 100644 --- a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm @@ -17,7 +17,7 @@ #import "chrome/browser/ui/cocoa/info_bubble_window.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #import "ui/base/cocoa/cocoa_event_utils.h" #import "ui/base/cocoa/controls/hyperlink_button_cell.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm index ae36e5c..fb0f6e7 100644 --- a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm @@ -13,7 +13,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" -#include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/cocoa/bubble_view.mm b/chrome/browser/ui/cocoa/bubble_view.mm index fd5d14b..e0f9e5f 100644 --- a/chrome/browser/ui/cocoa/bubble_view.mm +++ b/chrome/browser/ui/cocoa/bubble_view.mm @@ -6,8 +6,8 @@ #include "chrome/browser/themes/theme_properties.h" #import "chrome/browser/ui/cocoa/themed_window.h" -#import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" -#import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSBezierPath+RoundRect.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSColor+Luminance.h" #include "ui/base/theme_provider.h" // The roundedness of the edges of the bubble. This matches the value used on diff --git a/chrome/browser/ui/cocoa/confirm_bubble_cocoa.mm b/chrome/browser/ui/cocoa/confirm_bubble_cocoa.mm index d8fd880..8d6193b 100644 --- a/chrome/browser/ui/cocoa/confirm_bubble_cocoa.mm +++ b/chrome/browser/ui/cocoa/confirm_bubble_cocoa.mm @@ -9,7 +9,7 @@ #import "chrome/browser/ui/cocoa/confirm_bubble_controller.h" #include "chrome/browser/ui/confirm_bubble.h" #include "chrome/browser/ui/confirm_bubble_model.h" -#import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSBezierPath+RoundRect.h" #include "ui/gfx/image/image.h" #include "ui/gfx/point.h" diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.mm index 61fa6ac..7d48561 100644 --- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.mm +++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.mm @@ -11,7 +11,7 @@ #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h" #import "chrome/browser/ui/cocoa/hover_close_button.h" #include "skia/ext/skia_utils_mac.h" -#include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/cocoa/controls/hyperlink_button_cell.h" #include "ui/base/cocoa/window_size_constants.h" diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm index 11b581f..8e1e658 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm @@ -36,9 +36,9 @@ #include "content/public/browser/web_contents_view.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "third_party/apple_sample_code/ImageAndTextCell.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm index 2315651..b9ec1a3 100644 --- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm +++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm @@ -19,7 +19,7 @@ #include "content/public/browser/plugin_service.h" #include "grit/generated_resources.h" #include "skia/ext/skia_utils_mac.h" -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #import "ui/base/cocoa/controls/hyperlink_button_cell.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.mm index b62e1b4..190b039 100644 --- a/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.mm +++ b/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.mm @@ -8,7 +8,7 @@ #import "base/mac/mac_util.h" #include "base/strings/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h" -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/cocoa/download/download_item_cell.mm b/chrome/browser/ui/cocoa/download/download_item_cell.mm index 6f54fe0..c25e410 100644 --- a/chrome/browser/ui/cocoa/download/download_item_cell.mm +++ b/chrome/browser/ui/cocoa/download/download_item_cell.mm @@ -13,8 +13,8 @@ #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" #include "grit/theme_resources.h" -#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" -#import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSColor+Luminance.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/text_elider.h" #include "ui/gfx/canvas_skia_paint.h" diff --git a/chrome/browser/ui/cocoa/download/download_item_controller.mm b/chrome/browser/ui/cocoa/download/download_item_controller.mm index 5bc66cc..7cdcf2c 100644 --- a/chrome/browser/ui/cocoa/download/download_item_controller.mm +++ b/chrome/browser/ui/cocoa/download/download_item_controller.mm @@ -27,7 +27,7 @@ #include "content/public/browser/page_navigator.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/text_elider.h" diff --git a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm index 687da1b..51c70f7 100644 --- a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm +++ b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm @@ -22,7 +22,7 @@ #import "chrome/browser/ui/cocoa/presentation_mode_controller.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" -#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" #import "ui/base/cocoa/hover_button.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm b/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm index 17d22f5..48f937d 100644 --- a/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm +++ b/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm @@ -16,7 +16,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "grit/theme_resources.h" -#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" #include "third_party/skia/include/utils/mac/SkCGUtils.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm index 6fcbc55..6879d92 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm @@ -21,7 +21,7 @@ #include "extensions/common/extension.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" -#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia_paint.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm index f3da81c..a84a241 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm @@ -33,7 +33,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" #include "grit/theme_resources.h" -#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" using extensions::Extension; using extensions::ExtensionList; diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm index a0f499b..81e107e 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm @@ -18,7 +18,7 @@ #include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "skia/ext/skia_utils_mac.h" -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #import "ui/base/cocoa/controls/hyperlink_button_cell.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm index c86e629..0852b82 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm @@ -44,7 +44,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #import "skia/ext/skia_utils_mac.h" -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util.h" using content::BrowserThread; diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm index f6662f1..fd7123b 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm @@ -25,7 +25,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" -#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" #import "ui/base/cocoa/find_pasteboard.h" #import "ui/base/cocoa/focus_tracker.h" diff --git a/chrome/browser/ui/cocoa/first_run_dialog.mm b/chrome/browser/ui/cocoa/first_run_dialog.mm index 9e1fd32..b838ae6 100644 --- a/chrome/browser/ui/cocoa/first_run_dialog.mm +++ b/chrome/browser/ui/cocoa/first_run_dialog.mm @@ -20,7 +20,7 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" #include "grit/locale_settings.h" -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util_mac.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm index d6986c0..051bb49 100644 --- a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm @@ -22,9 +22,9 @@ #include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h" #include "grit/generated_resources.h" #include "grit/ui_strings.h" -#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" -#include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" +#include "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/accelerators/platform_accelerator_cocoa.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm index 49b848a..b42ff2e 100644 --- a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm @@ -21,7 +21,7 @@ #include "chrome/browser/ui/global_error/global_error_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "grit/generated_resources.h" -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/cocoa/gradient_button_cell.mm b/chrome/browser/ui/cocoa/gradient_button_cell.mm index 1935761..4cd6f37 100644 --- a/chrome/browser/ui/cocoa/gradient_button_cell.mm +++ b/chrome/browser/ui/cocoa/gradient_button_cell.mm @@ -14,7 +14,7 @@ #import "chrome/browser/ui/cocoa/rect_path_utils.h" #import "chrome/browser/ui/cocoa/themed_window.h" #include "grit/theme_resources.h" -#import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSColor+Luminance.h" #import "ui/base/cocoa/nsgraphics_context_additions.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" diff --git a/chrome/browser/ui/cocoa/hover_close_button.mm b/chrome/browser/ui/cocoa/hover_close_button.mm index 7825cf7..fa99676 100644 --- a/chrome/browser/ui/cocoa/hover_close_button.mm +++ b/chrome/browser/ui/cocoa/hover_close_button.mm @@ -7,7 +7,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" -#import "third_party/GTM/AppKit/GTMKeyValueAnimation.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMKeyValueAnimation.h" #include "ui/base/cocoa/animation_utils.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.mm b/chrome/browser/ui/cocoa/hung_renderer_controller.mm index cf314dc..524e5b4 100644 --- a/chrome/browser/ui/cocoa/hung_renderer_controller.mm +++ b/chrome/browser/ui/cocoa/hung_renderer_controller.mm @@ -25,7 +25,7 @@ #include "grit/theme_resources.h" #include "grit/ui_resources.h" #include "skia/ext/skia_utils_mac.h" -#include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/cocoa/info_bubble_view.mm b/chrome/browser/ui/cocoa/info_bubble_view.mm index 19d82f7..90f89e9 100644 --- a/chrome/browser/ui/cocoa/info_bubble_view.mm +++ b/chrome/browser/ui/cocoa/info_bubble_view.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/info_bubble_view.h" #include "base/logging.h" -#import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSBezierPath+RoundRect.h" @implementation InfoBubbleView diff --git a/chrome/browser/ui/cocoa/info_bubble_window.mm b/chrome/browser/ui/cocoa/info_bubble_window.mm index 7c72934..4822d19 100644 --- a/chrome/browser/ui/cocoa/info_bubble_window.mm +++ b/chrome/browser/ui/cocoa/info_bubble_window.mm @@ -11,7 +11,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" -#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" namespace { const CGFloat kOrderInSlideOffset = 10; diff --git a/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller.mm index 4a771ac..951c4b8 100644 --- a/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller.mm @@ -9,7 +9,7 @@ #include "chrome/browser/infobars/confirm_infobar_delegate.h" #import "chrome/browser/ui/cocoa/hyperlink_text_view.h" #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h" -#include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #import "ui/base/cocoa/cocoa_event_utils.h" #include "ui/base/window_open_disposition.h" diff --git a/chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm b/chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm index 4f0d7ff..a2007c0 100644 --- a/chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm +++ b/chrome/browser/ui/cocoa/infobars/translate_infobar_base.mm @@ -18,7 +18,7 @@ #import "chrome/browser/ui/cocoa/infobars/infobar_utilities.h" #include "chrome/browser/ui/cocoa/infobars/translate_message_infobar_controller.h" #include "grit/generated_resources.h" -#include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util.h" using InfoBarUtilities::MoveControl; diff --git a/chrome/browser/ui/cocoa/l10n_util.mm b/chrome/browser/ui/cocoa/l10n_util.mm index 4f21cd0..942de3b 100644 --- a/chrome/browser/ui/cocoa/l10n_util.mm +++ b/chrome/browser/ui/cocoa/l10n_util.mm @@ -6,7 +6,7 @@ #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" namespace cocoa_l10n_util { diff --git a/chrome/browser/ui/cocoa/login_prompt_cocoa.mm b/chrome/browser/ui/cocoa/login_prompt_cocoa.mm index 0b0572a..44e959d 100644 --- a/chrome/browser/ui/cocoa/login_prompt_cocoa.mm +++ b/chrome/browser/ui/cocoa/login_prompt_cocoa.mm @@ -21,7 +21,7 @@ #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" #include "net/url_request/url_request.h" -#include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util.h" using autofill::PasswordForm; diff --git a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm index fb16902..d7e22c7 100644 --- a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm +++ b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm @@ -10,7 +10,7 @@ #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.h" #include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #import "ui/base/cocoa/flipped_view.h" #import "ui/base/cocoa/window_size_constants.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/cocoa/notifications/balloon_view.mm b/chrome/browser/ui/cocoa/notifications/balloon_view.mm index b507eaba..7b884fd 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_view.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_view.mm @@ -8,7 +8,7 @@ #include "base/basictypes.h" #import "chrome/browser/ui/cocoa/notifications/balloon_controller.h" -#import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSBezierPath+RoundRect.h" namespace { diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm index 17678d2..b437f08 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm @@ -19,7 +19,7 @@ #include "chrome/common/autocomplete_match_type.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" -#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" #import "ui/base/cocoa/cocoa_event_utils.h" #import "ui/base/cocoa/flipped_view.h" #include "ui/base/cocoa/window_size_constants.h" diff --git a/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm b/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm index db6d681..8d27c1a 100644 --- a/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm +++ b/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm @@ -16,7 +16,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "skia/ext/skia_utils_mac.h" -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util_mac.h" namespace { diff --git a/chrome/browser/ui/cocoa/panels/panel_titlebar_view_cocoa.mm b/chrome/browser/ui/cocoa/panels/panel_titlebar_view_cocoa.mm index eaf40da..1888dade 100644 --- a/chrome/browser/ui/cocoa/panels/panel_titlebar_view_cocoa.mm +++ b/chrome/browser/ui/cocoa/panels/panel_titlebar_view_cocoa.mm @@ -13,8 +13,8 @@ #import "chrome/browser/ui/panels/panel_constants.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" -#import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSBezierPath+RoundRect.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSColor+Luminance.h" #include "ui/base/l10n/l10n_util_mac.h" #import "ui/base/cocoa/hover_image_button.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/cocoa/presentation_mode_controller.mm b/chrome/browser/ui/cocoa/presentation_mode_controller.mm index 0448db2..66605ff 100644 --- a/chrome/browser/ui/cocoa/presentation_mode_controller.mm +++ b/chrome/browser/ui/cocoa/presentation_mode_controller.mm @@ -11,7 +11,7 @@ #include "chrome/browser/fullscreen.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #include "chrome/common/chrome_switches.h" -#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" NSString* const kWillEnterFullscreenNotification = @"WillEnterFullscreenNotification"; diff --git a/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.mm b/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.mm index e47e710..04b0a77 100644 --- a/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.mm +++ b/chrome/browser/ui/cocoa/profile_signin_confirmation_view_controller.mm @@ -24,7 +24,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "skia/ext/skia_utils_mac.h" -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #import "ui/base/cocoa/controls/hyperlink_button_cell.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/cocoa/rect_path_utils.mm b/chrome/browser/ui/cocoa/rect_path_utils.mm index b1ee730..11503a1 100644 --- a/chrome/browser/ui/cocoa/rect_path_utils.mm +++ b/chrome/browser/ui/cocoa/rect_path_utils.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/rect_path_utils.h" -#import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSBezierPath+RoundRect.h" namespace rect_path_utils { diff --git a/chrome/browser/ui/cocoa/speech_recognition_window_controller.mm b/chrome/browser/ui/cocoa/speech_recognition_window_controller.mm index 2048fb2..887f75a 100644 --- a/chrome/browser/ui/cocoa/speech_recognition_window_controller.mm +++ b/chrome/browser/ui/cocoa/speech_recognition_window_controller.mm @@ -10,7 +10,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #import "skia/ext/skia_utils_mac.h" -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/cocoa/status_bubble_mac.mm b/chrome/browser/ui/cocoa/status_bubble_mac.mm index 2e5cdf8..a1b40f9 100644 --- a/chrome/browser/ui/cocoa/status_bubble_mac.mm +++ b/chrome/browser/ui/cocoa/status_bubble_mac.mm @@ -15,9 +15,9 @@ #include "base/strings/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/bubble_view.h" #include "net/base/net_util.h" -#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" -#import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" -#import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSBezierPath+RoundRect.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSColor+Luminance.h" #include "ui/base/cocoa/window_size_constants.h" #include "ui/gfx/font_list.h" #include "ui/gfx/point.h" diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm index 769ea74..7cb010a 100644 --- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm +++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm @@ -11,7 +11,7 @@ #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_controller.mm index c4da377..b5c6835 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_controller.mm @@ -19,7 +19,7 @@ #import "chrome/browser/ui/cocoa/themed_window.h" #import "extensions/common/extension.h" #include "grit/generated_resources.h" -#import "third_party/GTM/AppKit/GTMFadeTruncatingTextFieldCell.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMFadeTruncatingTextFieldCell.h" #import "ui/base/cocoa/menu_controller.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index d53b2a0..4a01295 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -62,7 +62,7 @@ #include "grit/theme_resources.h" #include "grit/ui_resources.h" #include "skia/ext/skia_utils_mac.h" -#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" #include "ui/base/cocoa/animation_utils.h" #import "ui/base/cocoa/tracking_area.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/cocoa/ui_localizer.h b/chrome/browser/ui/cocoa/ui_localizer.h index db9d7a2..65bf67c 100644 --- a/chrome/browser/ui/cocoa/ui_localizer.h +++ b/chrome/browser/ui/cocoa/ui_localizer.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_COCOA_UI_LOCALIZER_H_ #define CHROME_BROWSER_UI_COCOA_UI_LOCALIZER_H_ -#import "third_party/GTM/AppKit/GTMUILocalizer.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizer.h" @class NSString; diff --git a/chrome/browser/ui/cocoa/validation_message_bubble_cocoa.mm b/chrome/browser/ui/cocoa/validation_message_bubble_cocoa.mm index 94a410f..e138b65 100644 --- a/chrome/browser/ui/cocoa/validation_message_bubble_cocoa.mm +++ b/chrome/browser/ui/cocoa/validation_message_bubble_cocoa.mm @@ -12,7 +12,7 @@ #include "content/public/browser/render_widget_host.h" #include "content/public/browser/render_widget_host_view.h" #include "grit/theme_resources.h" -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #import "ui/base/cocoa/base_view.h" #import "ui/base/cocoa/flipped_view.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm index c6027db..82f0460 100644 --- a/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm @@ -27,7 +27,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #import "ui/base/cocoa/controls/hyperlink_button_cell.h" #import "ui/base/cocoa/flipped_view.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 5176db9..ed7f469 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3265,6 +3265,7 @@ }], ['OS=="mac"', { 'dependencies': [ + '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', '../third_party/mozilla/mozilla.gyp:mozilla', ], 'sources!': [ @@ -3288,15 +3289,6 @@ '$(SDKROOT)/System/Library/Frameworks/SecurityInterface.framework', ], }, - 'sources': [ - # Build the necessary GTM sources - '../third_party/GTM/Foundation/GTMServiceManagement.h', - '../third_party/GTM/Foundation/GTMServiceManagement.c', - ], - 'include_dirs': [ - '../third_party/GTM', - '../third_party/GTM/Foundation', - ], }], ['enable_rlz==1', { 'dependencies': [ diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index 58d02f6..1d952d5 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -3164,14 +3164,11 @@ 'browser/ui/webui/help/version_updater_basic.h', ], 'dependencies': [ - '../ui/ui.gyp:ui_cocoa_third_party_toolkits', '../third_party/apple_sample_code/apple_sample_code.gyp:apple_sample_code', + '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', '../third_party/molokocacao/molokocacao.gyp:molokocacao', '../third_party/mozilla/mozilla.gyp:mozilla', ], - 'include_dirs': [ - '../third_party/GTM', - ], 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/Quartz.framework', diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 6757b4b..b67a999 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -529,11 +529,11 @@ }], ['OS=="mac"', { 'dependencies': [ + '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', '../third_party/mach_override/mach_override.gyp:mach_override', ], 'include_dirs': [ '<(DEPTH)/breakpad/src', - '../third_party/GTM', ], 'sources!': [ 'common/child_process_logging_posix.cc', diff --git a/chrome/chrome_nibs.gyp b/chrome/chrome_nibs.gyp index cdc4c52..5b1b982 100644 --- a/chrome/chrome_nibs.gyp +++ b/chrome/chrome_nibs.gyp @@ -34,11 +34,10 @@ 'target_name': 'chrome_nibs', 'type': 'executable', 'mac_bundle': 1, + 'dependencies': [ + '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', + ], 'sources': [ - '../third_party/GTM/AppKit/GTMUILocalizer.h', - '../third_party/GTM/AppKit/GTMUILocalizer.mm', - '../third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h', - '../third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.mm', '../ui/base/cocoa/base_view.h', '../ui/base/cocoa/base_view.mm', '../ui/base/cocoa/controls/hyperlink_button_cell.h', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index d46430d..ba36b6f 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1888,9 +1888,6 @@ ], }], ['OS=="mac"', { - 'include_dirs': [ - '../third_party/GTM', - ], # TODO(mark): We really want this for all non-static library # targets, but when we tried to pull it up to the common.gypi # level, it broke other things like the ui and startup tests. *shrug* @@ -2182,9 +2179,6 @@ ], }], ['OS=="mac"', { - 'include_dirs': [ - '../third_party/GTM', - ], # TODO(mark): We really want this for all non-static library # targets, but when we tried to pull it up to the common.gypi # level, it broke other things like the ui and startup tests. *shrug* diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index f614049..4caa695 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -2414,12 +2414,9 @@ # The test fetches resources which means Mac need the app bundle to # exist on disk so it can pull from it. 'dependencies': [ - 'chrome', + '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', '../third_party/ocmock/ocmock.gyp:ocmock', - ], - 'include_dirs': [ - '../third_party/GTM', - '../third_party/GTM/AppKit', + 'chrome', ], 'sources!': [ 'browser/ui/tabs/dock_info_unittest.cc', diff --git a/chrome/common/mac/launchd.mm b/chrome/common/mac/launchd.mm index ec0acd9..848a2c7 100644 --- a/chrome/common/mac/launchd.mm +++ b/chrome/common/mac/launchd.mm @@ -13,7 +13,7 @@ #include "base/process/launch.h" #include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" -#include "third_party/GTM/Foundation/GTMServiceManagement.h" +#include "third_party/google_toolbox_for_mac/src/Foundation/GTMServiceManagement.h" namespace { diff --git a/remoting/DEPS b/remoting/DEPS index d839257..309afa5 100644 --- a/remoting/DEPS +++ b/remoting/DEPS @@ -11,8 +11,7 @@ include_rules = [ "-remoting", "+remoting/base", "+remoting/proto", - "+third_party/GTM", - "+third_party/GTM/AppKit", + "+third_party/google_toolbox_for_mac/src", "+third_party/libjingle", "+third_party/libvpx", "+third_party/libyuv", diff --git a/remoting/host/local_input_monitor_mac.mm b/remoting/host/local_input_monitor_mac.mm index 0a639e6..1e89587 100644 --- a/remoting/host/local_input_monitor_mac.mm +++ b/remoting/host/local_input_monitor_mac.mm @@ -17,7 +17,7 @@ #include "base/synchronization/lock.h" #include "base/threading/non_thread_safe.h" #include "remoting/host/client_session_control.h" -#import "third_party/GTM/AppKit/GTMCarbonEvent.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMCarbonEvent.h" #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" // Esc Key Code is 53. diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 3b6a9fb..41cdf0d 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -495,19 +495,8 @@ ], }], ['OS=="mac"', { - 'sources': [ - '../third_party/GTM/AppKit/GTMCarbonEvent.h', - '../third_party/GTM/AppKit/GTMCarbonEvent.m', - '../third_party/GTM/DebugUtils/GTMDebugSelectorValidation.h', - '../third_party/GTM/DebugUtils/GTMTypeCasting.h', - '../third_party/GTM/Foundation/GTMObjectSingleton.h', - '../third_party/GTM/GTMDefines.h', - ], - 'include_dirs': [ - '../third_party/GTM', - '../third_party/GTM/AppKit', - '../third_party/GTM/DebugUtils', - '../third_party/GTM/Foundation', + 'dependencies': [ + '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', ], 'link_settings': { 'libraries': [ diff --git a/third_party/google_toolbox_for_mac/LICENSE b/third_party/google_toolbox_for_mac/LICENSE new file mode 100644 index 0000000..6547128 --- /dev/null +++ b/third_party/google_toolbox_for_mac/LICENSE @@ -0,0 +1 @@ +See src/COPYING diff --git a/third_party/google_toolbox_for_mac/README.chromium b/third_party/google_toolbox_for_mac/README.chromium new file mode 100644 index 0000000..3c3543f --- /dev/null +++ b/third_party/google_toolbox_for_mac/README.chromium @@ -0,0 +1,13 @@ +Name: Google Toolbox for Mac +Short Name: google-toolbox-for-mac +URL: http://code.google.com/p/google-toolbox-for-mac/ +Version: 616 +Security Critical: Yes +License: Apache 2.0 + +Description: +A collection of source from different Google projects that may be of use to +developers working other Mac projects. + +Local Modifications: +None. diff --git a/third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp b/third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp new file mode 100644 index 0000000..ccf8796 --- /dev/null +++ b/third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp @@ -0,0 +1,207 @@ +# Copyright 2013 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. + +{ + 'targets': [ + { + 'target_name': 'google_toolbox_for_mac', + 'type': '<(component)', + 'include_dirs': [ + '.', + 'src', + 'src/AppKit', + 'src/DebugUtils', + 'src/Foundation', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '.', + 'src', + 'src/AppKit', + 'src/DebugUtils', + 'src/Foundation', + ], + }, + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/AddressBook.framework', + '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', + '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', + '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', + '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', + ], + }, + 'sources': [ + 'src/AddressBook/GTMABAddressBook.h', + 'src/AddressBook/GTMABAddressBook.m', + 'src/AppKit/GTMCarbonEvent.h', + 'src/AppKit/GTMCarbonEvent.m', + 'src/AppKit/GTMDelegatingTableColumn.h', + 'src/AppKit/GTMDelegatingTableColumn.m', + 'src/AppKit/GTMFadeTruncatingTextFieldCell.h', + 'src/AppKit/GTMFadeTruncatingTextFieldCell.m', + 'src/AppKit/GTMGetURLHandler.m', + 'src/AppKit/GTMGoogleSearch.h', + 'src/AppKit/GTMGoogleSearch.m', + 'src/AppKit/GTMHotKeyTextField.h', + 'src/AppKit/GTMHotKeyTextField.m', + 'src/AppKit/GTMIBArray.h', + 'src/AppKit/GTMIBArray.m', + 'src/AppKit/GTMKeyValueAnimation.h', + 'src/AppKit/GTMKeyValueAnimation.m', + 'src/AppKit/GTMLargeTypeWindow.h', + 'src/AppKit/GTMLargeTypeWindow.m', + 'src/AppKit/GTMLinearRGBShading.h', + 'src/AppKit/GTMLinearRGBShading.m', + 'src/AppKit/GTMLoginItems.h', + 'src/AppKit/GTMLoginItems.m', + 'src/AppKit/GTMNSAnimatablePropertyContainer.h', + 'src/AppKit/GTMNSAnimatablePropertyContainer.m', + 'src/AppKit/GTMNSAnimation+Duration.h', + 'src/AppKit/GTMNSAnimation+Duration.m', + 'src/AppKit/GTMNSBezierPath+CGPath.h', + 'src/AppKit/GTMNSBezierPath+CGPath.m', + 'src/AppKit/GTMNSBezierPath+RoundRect.h', + 'src/AppKit/GTMNSBezierPath+RoundRect.m', + 'src/AppKit/GTMNSBezierPath+Shading.h', + 'src/AppKit/GTMNSBezierPath+Shading.m', + 'src/AppKit/GTMNSColor+Luminance.h', + 'src/AppKit/GTMNSColor+Luminance.m', + 'src/AppKit/GTMNSImage+Scaling.h', + 'src/AppKit/GTMNSImage+Scaling.m', + 'src/AppKit/GTMNSImage+SearchCache.h', + 'src/AppKit/GTMNSImage+SearchCache.m', + 'src/AppKit/GTMNSWorkspace+Running.h', + 'src/AppKit/GTMNSWorkspace+Running.m', + 'src/AppKit/GTMShading.h', + 'src/AppKit/GTMUILocalizer.h', + 'src/AppKit/GTMUILocalizer.m', + 'src/AppKit/GTMUILocalizerAndLayoutTweaker.h', + 'src/AppKit/GTMUILocalizerAndLayoutTweaker.m', + 'src/AppKit/GTMWindowSheetController.h', + 'src/AppKit/GTMWindowSheetController.m', + 'src/DebugUtils/GTMDebugSelectorValidation.h', + 'src/DebugUtils/GTMDebugThreadValidation.h', + 'src/DebugUtils/GTMDebugThreadValidation.m', + 'src/DebugUtils/GTMMethodCheck.h', + 'src/DebugUtils/GTMMethodCheck.m', + 'src/DebugUtils/GTMTypeCasting.h', + 'src/Foundation/GTMAbstractDOListener.h', + 'src/Foundation/GTMAbstractDOListener.m', + 'src/Foundation/GTMCalculatedRange.h', + 'src/Foundation/GTMCalculatedRange.m', + 'src/Foundation/GTMExceptionalInlines.h', + 'src/Foundation/GTMExceptionalInlines.m', + 'src/Foundation/GTMFileSystemKQueue.h', + 'src/Foundation/GTMFileSystemKQueue.m', + 'src/Foundation/GTMFourCharCode.h', + 'src/Foundation/GTMFourCharCode.m', + 'src/Foundation/GTMGarbageCollection.h', + 'src/Foundation/GTMGeometryUtils.h', + 'src/Foundation/GTMGeometryUtils.m', + 'src/Foundation/GTMLightweightProxy.h', + 'src/Foundation/GTMLightweightProxy.m', + 'src/Foundation/GTMLocalizedString.h', + 'src/Foundation/GTMLogger+ASL.h', + 'src/Foundation/GTMLogger+ASL.m', + 'src/Foundation/GTMLogger.h', + 'src/Foundation/GTMLogger.m', + 'src/Foundation/GTMLoggerRingBufferWriter.h', + 'src/Foundation/GTMLoggerRingBufferWriter.m', + 'src/Foundation/GTMNSAppleEventDescriptor+Foundation.h', + 'src/Foundation/GTMNSAppleEventDescriptor+Foundation.m', + 'src/Foundation/GTMNSAppleEventDescriptor+Handler.h', + 'src/Foundation/GTMNSAppleEventDescriptor+Handler.m', + 'src/Foundation/GTMNSAppleScript+Handler.h', + 'src/Foundation/GTMNSAppleScript+Handler.m', + 'src/Foundation/GTMNSArray+Merge.h', + 'src/Foundation/GTMNSArray+Merge.m', + 'src/Foundation/GTMNSDictionary+CaseInsensitive.h', + 'src/Foundation/GTMNSDictionary+CaseInsensitive.m', + 'src/Foundation/GTMNSDictionary+URLArguments.h', + 'src/Foundation/GTMNSDictionary+URLArguments.m', + 'src/Foundation/GTMNSEnumerator+Filter.h', + 'src/Foundation/GTMNSEnumerator+Filter.m', + 'src/Foundation/GTMNSFileHandle+UniqueName.h', + 'src/Foundation/GTMNSFileHandle+UniqueName.m', + 'src/Foundation/GTMNSFileManager+Carbon.h', + 'src/Foundation/GTMNSFileManager+Carbon.m', + 'src/Foundation/GTMNSFileManager+Path.h', + 'src/Foundation/GTMNSFileManager+Path.m', + 'src/Foundation/GTMNSNumber+64Bit.h', + 'src/Foundation/GTMNSNumber+64Bit.m', + 'src/Foundation/GTMNSObject+KeyValueObserving.h', + 'src/Foundation/GTMNSObject+KeyValueObserving.m', + 'src/Foundation/GTMNSScanner+JSON.h', + 'src/Foundation/GTMNSScanner+JSON.m', + 'src/Foundation/GTMNSScanner+Unsigned.h', + 'src/Foundation/GTMNSScanner+Unsigned.m', + 'src/Foundation/GTMNSString+FindFolder.h', + 'src/Foundation/GTMNSString+FindFolder.m', + 'src/Foundation/GTMNSString+HTML.h', + 'src/Foundation/GTMNSString+HTML.m', + 'src/Foundation/GTMNSString+Replace.h', + 'src/Foundation/GTMNSString+Replace.m', + 'src/Foundation/GTMNSString+URLArguments.h', + 'src/Foundation/GTMNSString+URLArguments.m', + 'src/Foundation/GTMNSString+XML.h', + 'src/Foundation/GTMNSString+XML.m', + 'src/Foundation/GTMNSThread+Blocks.h', + 'src/Foundation/GTMNSThread+Blocks.m', + 'src/Foundation/GTMObjC2Runtime.h', + 'src/Foundation/GTMObjC2Runtime.m', + 'src/Foundation/GTMObjectSingleton.h', + 'src/Foundation/GTMPath.h', + 'src/Foundation/GTMPath.m', + 'src/Foundation/GTMRegex.h', + 'src/Foundation/GTMRegex.m', + 'src/Foundation/GTMScriptRunner.h', + 'src/Foundation/GTMScriptRunner.m', + 'src/Foundation/GTMServiceManagement.c', + 'src/Foundation/GTMServiceManagement.h', + 'src/Foundation/GTMSignalHandler.h', + 'src/Foundation/GTMSignalHandler.m', + 'src/Foundation/GTMStackTrace.h', + 'src/Foundation/GTMStackTrace.m', + 'src/Foundation/GTMStringEncoding.h', + 'src/Foundation/GTMStringEncoding.m', + 'src/Foundation/GTMSystemVersion.h', + 'src/Foundation/GTMSystemVersion.m', + 'src/Foundation/GTMTransientRootPortProxy.h', + 'src/Foundation/GTMTransientRootPortProxy.m', + 'src/Foundation/GTMTransientRootProxy.h', + 'src/Foundation/GTMTransientRootProxy.m', + 'src/Foundation/GTMURITemplate.h', + 'src/Foundation/GTMURITemplate.m', + 'src/Foundation/GTMValidatingContainers.h', + 'src/Foundation/GTMValidatingContainers.m', + 'src/Foundation/GTMLogger.h', + 'src/Foundation/GTMLogger.m', + 'src/Foundation/GTMNSNumber+64Bit.h', + 'src/Foundation/GTMNSNumber+64Bit.m', + 'src/Foundation/GTMNSObject+KeyValueObserving.h', + 'src/Foundation/GTMNSObject+KeyValueObserving.m', + 'src/Foundation/GTMObjectSingleton.h', + 'src/Foundation/GTMServiceManagement.c', + 'src/Foundation/GTMServiceManagement.h', + 'src/GTMDefines.h', + ], + 'conditions': [ + ['component=="shared_library"', + { + # GTM is third-party code, so we don't want to add _EXPORT + # annotations to it, so build it without -fvisibility=hidden + # (else the interface class symbols will be hidden in a 64bit + # build). Only do this in a component build, so that the shipping + # chrome binary doesn't end up with unnecessarily exported + # symbols. + 'xcode_settings': { + 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', + }, + } + ], + ], + }, + ], +} diff --git a/third_party/molokocacao/NSBezierPath+MCAdditions.m b/third_party/molokocacao/NSBezierPath+MCAdditions.m index 3761f34..3b006ed 100644 --- a/third_party/molokocacao/NSBezierPath+MCAdditions.m +++ b/third_party/molokocacao/NSBezierPath+MCAdditions.m @@ -7,7 +7,7 @@ #import "NSBezierPath+MCAdditions.h" -#import "third_party/GTM/AppKit/GTMNSBezierPath+CGPath.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSBezierPath+CGPath.h" // remove/comment out this line of you don't want to use undocumented functions #define MCBEZIER_USE_PRIVATE_FUNCTION @@ -20,7 +20,7 @@ static void CGPathCallback(void *info, const CGPathElement *element) { NSBezierPath *path = info; CGPoint *points = element->points; - + switch (element->type) { case kCGPathElementMoveToPoint: { diff --git a/third_party/molokocacao/molokocacao.gyp b/third_party/molokocacao/molokocacao.gyp index 93d0a4b..536d80d 100644 --- a/third_party/molokocacao/molokocacao.gyp +++ b/third_party/molokocacao/molokocacao.gyp @@ -8,7 +8,7 @@ 'target_name': 'molokocacao', 'type': 'static_library', 'dependencies': [ - '../../ui/ui.gyp:ui_cocoa_third_party_toolkits', + '../google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', ], 'link_settings': { 'libraries': [ diff --git a/tools/include_tracer.py b/tools/include_tracer.py index df30c65..567a797 100755 --- a/tools/include_tracer.py +++ b/tools/include_tracer.py @@ -25,9 +25,7 @@ INCLUDE_PATHS = [ 'skia/ext', 'testing/gmock/include', 'testing/gtest/include', - 'third_party/GTM', 'third_party/WebKit/Source', - 'third_party/WebKit/Source/wtf', 'third_party/WebKit/Source/core', 'third_party/WebKit/Source/core/accessibility', 'third_party/WebKit/Source/core/accessibility/chromium', @@ -113,7 +111,9 @@ INCLUDE_PATHS = [ 'third_party/WebKit/Source/core/xml', 'third_party/WebKit/Source/public', 'third_party/WebKit/Source/web', + 'third_party/WebKit/Source/wtf', 'third_party/cld', + 'third_party/google_toolbox_for_mac/src', 'third_party/icu/public/common', 'third_party/icu/public/i18n', 'third_party/npapi', diff --git a/tools/licenses.py b/tools/licenses.py index e87a54d..3bf998f 100755 --- a/tools/licenses.py +++ b/tools/licenses.py @@ -140,12 +140,6 @@ SPECIAL_CASES = { # Absolute path here is resolved as relative to the source root. "License File": "/LICENSE.chromium_os", }, - os.path.join('third_party', 'GTM'): { - "Name": "Google Toolbox for Mac", - "URL": "http://code.google.com/p/google-toolbox-for-mac/", - "License": "Apache 2.0", - "License File": "COPYING", - }, os.path.join('third_party', 'lss'): { "Name": "linux-syscall-support", "URL": "http://code.google.com/p/linux-syscall-support/", diff --git a/ui/app_list/DEPS b/ui/app_list/DEPS index bd3bf14..e3cb0bc 100644 --- a/ui/app_list/DEPS +++ b/ui/app_list/DEPS @@ -3,9 +3,8 @@ include_rules = [ "+grit/ui_strings.h", "+skia", "+sync", + "+third_party/google_toolbox_for_mac/src", "+third_party/skia", - # Allow inclusion of third-party code: - "+third_party/GTM", # Google Toolbox for Mac. "+ui/aura", "+ui/base", "+ui/compositor", diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp index e766c21..d06df53 100644 --- a/ui/app_list/app_list.gyp +++ b/ui/app_list/app_list.gyp @@ -152,10 +152,7 @@ }], ['OS=="mac"', { 'dependencies': [ - '../ui.gyp:ui_cocoa_third_party_toolkits', - ], - 'include_dirs': [ - '../../third_party/GTM', + '../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', ], 'link_settings': { 'libraries': [ diff --git a/ui/app_list/cocoa/apps_search_box_controller.mm b/ui/app_list/cocoa/apps_search_box_controller.mm index b937c4c..9396282 100644 --- a/ui/app_list/cocoa/apps_search_box_controller.mm +++ b/ui/app_list/cocoa/apps_search_box_controller.mm @@ -8,7 +8,7 @@ #include "base/mac/mac_util.h" #include "base/strings/sys_string_conversions.h" #include "grit/ui_resources.h" -#import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSBezierPath+RoundRect.h" #include "ui/app_list/app_list_menu.h" #include "ui/app_list/app_list_model.h" #include "ui/app_list/search_box_model.h" diff --git a/ui/app_list/cocoa/signin_view_controller.mm b/ui/app_list/cocoa/signin_view_controller.mm index 3930958..e8d2651 100644 --- a/ui/app_list/cocoa/signin_view_controller.mm +++ b/ui/app_list/cocoa/signin_view_controller.mm @@ -8,8 +8,8 @@ #include "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" #include "skia/ext/skia_utils_mac.h" -#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "third_party/skia/include/core/SkColor.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/app_list/app_list_constants.h" #include "ui/app_list/signin_delegate.h" #import "ui/base/cocoa/controls/blue_label_button.h" diff --git a/ui/message_center/DEPS b/ui/message_center/DEPS index 9792503..7b1966f 100644 --- a/ui/message_center/DEPS +++ b/ui/message_center/DEPS @@ -2,7 +2,6 @@ include_rules = [ "+grit/ui_resources.h", "+grit/ui_strings.h", "+skia/ext", - "+third_party/GTM", # For Mac utility classes. "+third_party/skia", "+ui/aura", "+ui/base", diff --git a/ui/message_center/message_center.gyp b/ui/message_center/message_center.gyp index 569f447..4a09a8c 100644 --- a/ui/message_center/message_center.gyp +++ b/ui/message_center/message_center.gyp @@ -132,14 +132,6 @@ 'views/message_popup_bubble.h', ], }], - ['OS=="mac"', { - 'dependencies': [ - '../ui.gyp:ui_cocoa_third_party_toolkits', - ], - 'include_dirs': [ - '../../third_party/GTM', - ], - }], ['toolkit_views==1', { 'dependencies': [ '../compositor/compositor.gyp:compositor', @@ -630,63 +630,5 @@ }, ], }], - ['OS=="mac"', { - 'targets': [ - { - 'target_name': 'ui_cocoa_third_party_toolkits', - 'type': '<(component)', - 'sources': [ - # Build the necessary GTM sources - '../third_party/GTM/AppKit/GTMFadeTruncatingTextFieldCell.h', - '../third_party/GTM/AppKit/GTMFadeTruncatingTextFieldCell.m', - '../third_party/GTM/AppKit/GTMIBArray.h', - '../third_party/GTM/AppKit/GTMIBArray.m', - '../third_party/GTM/AppKit/GTMKeyValueAnimation.h', - '../third_party/GTM/AppKit/GTMKeyValueAnimation.m', - '../third_party/GTM/AppKit/GTMNSAnimation+Duration.h', - '../third_party/GTM/AppKit/GTMNSAnimation+Duration.m', - '../third_party/GTM/AppKit/GTMNSBezierPath+CGPath.h', - '../third_party/GTM/AppKit/GTMNSBezierPath+CGPath.m', - '../third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h', - '../third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.m', - '../third_party/GTM/AppKit/GTMNSColor+Luminance.m', - '../third_party/GTM/AppKit/GTMUILocalizer.h', - '../third_party/GTM/AppKit/GTMUILocalizer.m', - '../third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h', - '../third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.m', - '../third_party/GTM/Foundation/GTMNSNumber+64Bit.h', - '../third_party/GTM/Foundation/GTMNSNumber+64Bit.m', - '../third_party/GTM/Foundation/GTMNSObject+KeyValueObserving.h', - '../third_party/GTM/Foundation/GTMNSObject+KeyValueObserving.m', - ], - 'include_dirs': [ - '..', - '../third_party/GTM', - '../third_party/GTM/AppKit', - '../third_party/GTM/DebugUtils', - '../third_party/GTM/Foundation', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', - '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', - ], - }, - 'conditions': [ - ['component=="shared_library"', { - # GTM is third-party code, so we don't want to add _EXPORT - # annotations to it, so build it without -fvisibility=hidden - # (else the interface class symbols will be hidden in a 64bit - # build). Only do this in a component build, so that the shipping - # chrome binary doesn't end up with unnecessarily exported - # symbols. - 'xcode_settings': { - 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', - }, - }], - ], - }, - ], - }], ], } |