diff options
56 files changed, 9 insertions, 63 deletions
diff --git a/ash/test/test_suite_init.mm b/ash/test/test_suite_init.mm index 0c8fd4a..c32df2b 100644 --- a/ash/test/test_suite_init.mm +++ b/ash/test/test_suite_init.mm @@ -8,7 +8,6 @@ #include "base/files/file_path.h" #include "base/mac/bundle_locations.h" -#include "base/mac/scoped_nsobject.h" #include "base/path_service.h" namespace ash { diff --git a/base/mac/scoped_sending_event.h b/base/mac/scoped_sending_event.h index 75cfec8..92c2155 100644 --- a/base/mac/scoped_sending_event.h +++ b/base/mac/scoped_sending_event.h @@ -7,7 +7,6 @@ #include "base/base_export.h" #include "base/basictypes.h" -#include "base/mac/scoped_nsobject.h" #include "base/message_loop/message_pump_mac.h" // Nested event loops can pump IPC messages, including diff --git a/chrome/browser/chrome_browser_application_mac.h b/chrome/browser/chrome_browser_application_mac.h index 5bcfc15..136e448 100644 --- a/chrome/browser/chrome_browser_application_mac.h +++ b/chrome/browser/chrome_browser_application_mac.h @@ -11,7 +11,6 @@ #include <vector> -#import "base/mac/scoped_nsobject.h" #import "base/mac/scoped_sending_event.h" #import "base/message_loop/message_pump_mac.h" #include "base/synchronization/lock.h" diff --git a/chrome/browser/importer/safari_importer.mm b/chrome/browser/importer/safari_importer.mm index e1eed6c..0523d79 100644 --- a/chrome/browser/importer/safari_importer.mm +++ b/chrome/browser/importer/safari_importer.mm @@ -11,7 +11,6 @@ #include "base/file_util.h" #include "base/mac/mac_util.h" -#include "base/mac/scoped_nsobject.h" #include "base/strings/string16.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/browser/ssl/ssl_add_cert_handler_mac.mm b/chrome/browser/ssl/ssl_add_cert_handler_mac.mm index bdcf6f3..a2906f9 100644 --- a/chrome/browser/ssl/ssl_add_cert_handler_mac.mm +++ b/chrome/browser/ssl/ssl_add_cert_handler_mac.mm @@ -8,7 +8,6 @@ #include <SecurityInterface/SFCertificateView.h> #include "base/logging.h" -#include "base/mac/scoped_nsobject.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" diff --git a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm index 901f7d6..12bdcb9 100644 --- a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm +++ b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm @@ -4,6 +4,7 @@ #import <Cocoa/Cocoa.h> +#include "base/mac/scoped_nsobject.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" diff --git a/chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h b/chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h index e570646..09119f4 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h +++ b/chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h @@ -8,7 +8,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/mac/scoped_nsobject.h" +#include "base/compiler_specific.h" #include "chrome/browser/ui/autofill/autofill_popup_view.h" @class AutofillPopupViewCocoa; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm index 2f56924..6e21dc2 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm @@ -4,7 +4,6 @@ #import <Cocoa/Cocoa.h> -#include "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h index 285bc25..513512f 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h @@ -6,8 +6,6 @@ #define CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_FOLDER_WINDOW_H_ #import <Cocoa/Cocoa.h> -#include "base/mac/scoped_nsobject.h" - // Window for a bookmark folder "menu". This menu pops up when you // click on a bookmark button that represents a folder of bookmarks. @@ -27,5 +25,4 @@ @interface BookmarkBarFolderWindowScrollView : NSScrollView @end - #endif // CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_FOLDER_WINDOW_H_ diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm index 9fb9b52..2701dd6 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/memory/scoped_ptr.h" +#include "base/mac/scoped_nsobject.h" #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm index 1aeeaa8..623191b 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm @@ -4,7 +4,6 @@ #import <Cocoa/Cocoa.h> -#include "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm index 092df71..e5eedd5 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm @@ -4,7 +4,6 @@ #import <AppKit/AppKit.h> -#import "base/mac/scoped_nsobject.h" #include "base/strings/string16.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h index cbafd35..f5246b6 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h @@ -25,7 +25,6 @@ #include "base/basictypes.h" #include "base/mac/scoped_block.h" -#include "base/mac/scoped_nsobject.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm index c508ebe..83e8dae 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm @@ -4,7 +4,6 @@ #import <Cocoa/Cocoa.h> -#include "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm index 83ddfa3..32f365f 100644 --- a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h" -#include "base/mac/scoped_nsobject.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service_factory.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index ca64f36..6f70d9f 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm @@ -10,7 +10,6 @@ #include "base/command_line.h" #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" -#import "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" // IDC_* diff --git a/chrome/browser/ui/cocoa/certificate_viewer_mac.mm b/chrome/browser/ui/cocoa/certificate_viewer_mac.mm index 20d5787..8e8ab9c 100644 --- a/chrome/browser/ui/cocoa/certificate_viewer_mac.mm +++ b/chrome/browser/ui/cocoa/certificate_viewer_mac.mm @@ -10,8 +10,6 @@ #include "base/mac/foundation_util.h" #include "base/mac/scoped_cftyperef.h" -#include "base/mac/scoped_nsobject.h" -#include "base/memory/scoped_ptr.h" #include "chrome/browser/certificate_viewer.h" #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet.h" diff --git a/chrome/browser/ui/cocoa/chrome_event_processing_window.h b/chrome/browser/ui/cocoa/chrome_event_processing_window.h index 6cbc927..b9a20e9 100644 --- a/chrome/browser/ui/cocoa/chrome_event_processing_window.h +++ b/chrome/browser/ui/cocoa/chrome_event_processing_window.h @@ -7,7 +7,6 @@ #import <Cocoa/Cocoa.h> -#include "base/mac/scoped_nsobject.h" #import "ui/base/cocoa/underlay_opengl_hosting_window.h" // Override NSWindow to access unhandled keyboard events (for command diff --git a/chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm b/chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm index b1566e9..3865b24 100644 --- a/chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm +++ b/chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm @@ -5,7 +5,6 @@ #include <Carbon/Carbon.h> #include "base/debug/debugger.h" -#include "base/mac/scoped_nsobject.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" diff --git a/chrome/browser/ui/cocoa/clickhold_button_cell.h b/chrome/browser/ui/cocoa/clickhold_button_cell.h index 7e290ae..187eef0 100644 --- a/chrome/browser/ui/cocoa/clickhold_button_cell.h +++ b/chrome/browser/ui/cocoa/clickhold_button_cell.h @@ -7,7 +7,6 @@ #import <Cocoa/Cocoa.h> -#include "base/mac/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/image_button_cell.h" // A button cell that implements "click hold" behavior after a specified delay diff --git a/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm index 05b4652..f458e56 100644 --- a/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm @@ -3,8 +3,6 @@ // found in the LICENSE file. #include "base/compiler_specific.h" -#include "base/mac/scoped_nsobject.h" -#include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm b/chrome/browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm index d330230..f191e0f 100644 --- a/chrome/browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/confirm_quit_panel_controller.h" -#include "base/mac/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/confirm_quit.h" #include "testing/gtest_mac.h" diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h index 081f98d..6781fd3 100644 --- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h +++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h @@ -6,7 +6,6 @@ #import <Cocoa/Cocoa.h> -#include "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/base_bubble_controller.h" #include "content/public/common/media_stream_request.h" diff --git a/chrome/browser/ui/cocoa/download/download_item_mac.h b/chrome/browser/ui/cocoa/download/download_item_mac.h index 2bbd754..6d77801 100644 --- a/chrome/browser/ui/cocoa/download/download_item_mac.h +++ b/chrome/browser/ui/cocoa/download/download_item_mac.h @@ -7,8 +7,6 @@ #import <Cocoa/Cocoa.h> -#include "base/mac/scoped_nsobject.h" -#include "base/memory/scoped_ptr.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/icon_manager.h" #include "chrome/common/cancelable_task_tracker.h" diff --git a/chrome/browser/ui/cocoa/download/download_shelf_view.mm b/chrome/browser/ui/cocoa/download/download_shelf_view.mm index 203b66c..a80420ed 100644 --- a/chrome/browser/ui/cocoa/download/download_shelf_view.mm +++ b/chrome/browser/ui/cocoa/download/download_shelf_view.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/download/download_shelf_view.h" -#include "base/mac/scoped_nsobject.h" #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/themes/theme_service.h" #import "chrome/browser/ui/cocoa/nsview_additions.h" diff --git a/chrome/browser/ui/cocoa/draggable_button_mixin.mm b/chrome/browser/ui/cocoa/draggable_button_mixin.mm index 934e429..986f5e9 100644 --- a/chrome/browser/ui/cocoa/draggable_button_mixin.mm +++ b/chrome/browser/ui/cocoa/draggable_button_mixin.mm @@ -7,9 +7,6 @@ #include <cmath> #include "base/logging.h" -#import "base/mac/scoped_nsobject.h" - -namespace { // Code taken from <http://codereview.chromium.org/180036/diff/3001/3004>. // TODO(viettrungluu): Do we want common, standard code for drag hysteresis? @@ -17,8 +14,6 @@ const CGFloat kWebDragStartHysteresisX = 5.0; const CGFloat kWebDragStartHysteresisY = 5.0; const CGFloat kDragExpirationTimeout = 0.45; -} - // Private ///////////////////////////////////////////////////////////////////// @interface DraggableButtonImpl (Private) diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm index b528c70..2a0a0d3 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm @@ -7,7 +7,6 @@ #include <algorithm> #include "base/basictypes.h" -#import "base/mac/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/view_id_util.h" NSString* const kBrowserActionGrippyDragStartedNotification = diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h index 6c08460..35d5ccf 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h @@ -7,7 +7,6 @@ #import <Cocoa/Cocoa.h> -#include "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" class AsyncUninstaller; diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.h b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.h index 014f0a4..7bd1f23 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.h +++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.h @@ -7,7 +7,6 @@ #import <Cocoa/Cocoa.h> -#import "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/base_bubble_controller.h" #import "chrome/browser/ui/cocoa/info_bubble_view.h" diff --git a/chrome/browser/ui/cocoa/framed_browser_window.h b/chrome/browser/ui/cocoa/framed_browser_window.h index 024dc99..a5750bf 100644 --- a/chrome/browser/ui/cocoa/framed_browser_window.h +++ b/chrome/browser/ui/cocoa/framed_browser_window.h @@ -7,7 +7,6 @@ #import <Cocoa/Cocoa.h> -#include "base/mac/scoped_nsobject.h" #include "chrome/browser/ui/cocoa/chrome_browser_window.h" // Offsets from the top/left of the window frame to the top of the window diff --git a/chrome/browser/ui/cocoa/fullscreen_window_unittest.mm b/chrome/browser/ui/cocoa/fullscreen_window_unittest.mm index b80022b..053a951 100644 --- a/chrome/browser/ui/cocoa/fullscreen_window_unittest.mm +++ b/chrome/browser/ui/cocoa/fullscreen_window_unittest.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/memory/scoped_ptr.h" +#include "base/mac/scoped_nsobject.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/fullscreen_window.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/hover_close_button.mm b/chrome/browser/ui/cocoa/hover_close_button.mm index a49a0f4..7825cf7 100644 --- a/chrome/browser/ui/cocoa/hover_close_button.mm +++ b/chrome/browser/ui/cocoa/hover_close_button.mm @@ -4,8 +4,6 @@ #import "chrome/browser/ui/cocoa/hover_close_button.h" -#include "base/mac/scoped_nsobject.h" -#include "base/memory/scoped_ptr.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller_unittest.mm b/chrome/browser/ui/cocoa/hung_renderer_controller_unittest.mm index 87bfdc4..d7e1766 100644 --- a/chrome/browser/ui/cocoa/hung_renderer_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/hung_renderer_controller_unittest.mm @@ -4,7 +4,6 @@ #import <Cocoa/Cocoa.h> -#import "base/mac/scoped_nsobject.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/hung_renderer_controller.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/info_bubble_view.mm b/chrome/browser/ui/cocoa/info_bubble_view.mm index 33a749e..a25932a 100644 --- a/chrome/browser/ui/cocoa/info_bubble_view.mm +++ b/chrome/browser/ui/cocoa/info_bubble_view.mm @@ -5,7 +5,6 @@ #import "chrome/browser/ui/cocoa/info_bubble_view.h" #include "base/logging.h" -#include "base/mac/scoped_nsobject.h" #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" @implementation InfoBubbleView diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h index 7bb35d1..3948654 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h @@ -9,7 +9,6 @@ #import <Cocoa/Cocoa.h> -#include "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/ui/cocoa/menu_button.mm b/chrome/browser/ui/cocoa/menu_button.mm index d063974..4147a16 100644 --- a/chrome/browser/ui/cocoa/menu_button.mm +++ b/chrome/browser/ui/cocoa/menu_button.mm @@ -5,7 +5,6 @@ #import "chrome/browser/ui/cocoa/menu_button.h" #include "base/logging.h" -#include "base/mac/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/clickhold_button_cell.h" #import "chrome/browser/ui/cocoa/nsview_additions.h" diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm index 528d2f4..fb481cd 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm @@ -6,7 +6,6 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" -#import "base/mac/scoped_nsobject.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/desktop_notification_service.h" diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm index 10902b5..6727dbb 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/mac/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/balloon_collection.h" diff --git a/chrome/browser/ui/cocoa/notifications/balloon_view.mm b/chrome/browser/ui/cocoa/notifications/balloon_view.mm index cb7911e..b507eaba 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_view.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_view.mm @@ -7,7 +7,6 @@ #import <Cocoa/Cocoa.h> #include "base/basictypes.h" -#include "base/mac/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/notifications/balloon_controller.h" #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" diff --git a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm index c4c3dff..24b6cb7 100644 --- a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h" -#include "base/mac/scoped_nsobject.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/browser/ui/cocoa/profile_menu_controller.h b/chrome/browser/ui/cocoa/profile_menu_controller.h index c2b17aa..d7e552b 100644 --- a/chrome/browser/ui/cocoa/profile_menu_controller.h +++ b/chrome/browser/ui/cocoa/profile_menu_controller.h @@ -7,7 +7,6 @@ #import <Cocoa/Cocoa.h> -#include "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" class AvatarMenuModel; diff --git a/chrome/browser/ui/cocoa/profile_menu_controller.mm b/chrome/browser/ui/cocoa/profile_menu_controller.mm index 0ef2503..f1ee54e 100644 --- a/chrome/browser/ui/cocoa/profile_menu_controller.mm +++ b/chrome/browser/ui/cocoa/profile_menu_controller.mm @@ -4,6 +4,7 @@ #import "chrome/browser/ui/cocoa/profile_menu_controller.h" +#include "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/avatar_menu_model.h" diff --git a/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.mm b/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.mm index 42d2197..0ff7557 100644 --- a/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.mm +++ b/chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.mm @@ -5,7 +5,6 @@ #include "chrome/browser/ui/cocoa/tab_contents/render_view_context_menu_mac.h" #include "base/compiler_specific.h" -#include "base/mac/scoped_nsobject.h" #import "base/mac/scoped_sending_event.h" #include "base/message_loop.h" #include "base/strings/sys_string_conversions.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_audio_indicator_view_mac.h b/chrome/browser/ui/cocoa/tabs/tab_audio_indicator_view_mac.h index ca8a0d7..4a21e7d 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_audio_indicator_view_mac.h +++ b/chrome/browser/ui/cocoa/tabs/tab_audio_indicator_view_mac.h @@ -7,7 +7,6 @@ #import <Cocoa/Cocoa.h> -#include "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" namespace content { diff --git a/chrome/browser/ui/cocoa/tabs/tab_audio_indicator_view_mac_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_audio_indicator_view_mac_unittest.mm index a149d2a..b4b3620 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_audio_indicator_view_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_audio_indicator_view_mac_unittest.mm @@ -5,6 +5,7 @@ #import "chrome/browser/ui/cocoa/tabs/tab_audio_indicator_view_mac.h" #include "base/message_loop.h" +#include "base/mac/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" class TabAudioIndicatorViewMacTest : public CocoaTest { diff --git a/chrome/browser/ui/cocoa/tabs/throbber_view.h b/chrome/browser/ui/cocoa/tabs/throbber_view.h index 4e124f9..ade4d7f 100644 --- a/chrome/browser/ui/cocoa/tabs/throbber_view.h +++ b/chrome/browser/ui/cocoa/tabs/throbber_view.h @@ -7,8 +7,6 @@ #import <Cocoa/Cocoa.h> -#include "base/mac/scoped_nsobject.h" - @protocol ThrobberDataDelegate; // A class that knows how to draw an animated state to indicate progress. diff --git a/chrome/browser/ui/cocoa/tabs/throbber_view.mm b/chrome/browser/ui/cocoa/tabs/throbber_view.mm index 6abc29a..0d838a3 100644 --- a/chrome/browser/ui/cocoa/tabs/throbber_view.mm +++ b/chrome/browser/ui/cocoa/tabs/throbber_view.mm @@ -7,6 +7,7 @@ #include <set> #include "base/logging.h" +#include "base/mac/scoped_nsobject.h" static const float kAnimationIntervalSeconds = 0.03; // 30ms, same as windows diff --git a/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm b/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm index bda53cc..9dff6b1e 100644 --- a/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm @@ -5,7 +5,6 @@ #import <Cocoa/Cocoa.h> #include "base/compiler_specific.h" -#include "base/mac/scoped_nsobject.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/task_manager/resource_provider.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/ui/cocoa/validation_message_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/validation_message_bubble_controller_unittest.mm index 594d379..c80c24d 100644 --- a/chrome/browser/ui/cocoa/validation_message_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/validation_message_bubble_controller_unittest.mm @@ -4,7 +4,6 @@ #import <Cocoa/Cocoa.h> -#include "base/mac/scoped_nsobject.h" #include "base/strings/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/validation_message_bubble_controller.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm index 4cf3505..e4e3c0c 100644 --- a/chrome/browser/web_applications/web_app_mac.mm +++ b/chrome/browser/web_applications/web_app_mac.mm @@ -17,7 +17,6 @@ #include "base/mac/mac_logging.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" -#include "base/mac/scoped_nsobject.h" #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/common/mac/objc_method_swizzle.mm b/chrome/common/mac/objc_method_swizzle.mm index b0fd42d..62b630a 100644 --- a/chrome/common/mac/objc_method_swizzle.mm +++ b/chrome/common/mac/objc_method_swizzle.mm @@ -5,7 +5,6 @@ #import "chrome/common/mac/objc_method_swizzle.h" #import "base/logging.h" -#import "base/mac/scoped_nsobject.h" namespace ObjcEvilDoers { diff --git a/content/browser/accessibility/browser_accessibility_mac.h b/content/browser/accessibility/browser_accessibility_mac.h index 4031854..63a9d00 100644 --- a/content/browser/accessibility/browser_accessibility_mac.h +++ b/content/browser/accessibility/browser_accessibility_mac.h @@ -9,7 +9,6 @@ #include <utility> #include <vector> -#include "base/mac/scoped_nsobject.h" #include "content/browser/accessibility/browser_accessibility.h" @class BrowserAccessibilityCocoa; diff --git a/content/browser/renderer_host/text_input_client_message_filter.mm b/content/browser/renderer_host/text_input_client_message_filter.mm index 5c8dfd9..cea0a34 100644 --- a/content/browser/renderer_host/text_input_client_message_filter.mm +++ b/content/browser/renderer_host/text_input_client_message_filter.mm @@ -4,7 +4,6 @@ #include "content/browser/renderer_host/text_input_client_message_filter.h" -#include "base/mac/scoped_nsobject.h" #include "base/strings/string16.h" #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/browser/renderer_host/text_input_client_mac.h" diff --git a/net/base/platform_mime_util_mac.mm b/net/base/platform_mime_util_mac.mm index 31bec5d..cf5b262 100644 --- a/net/base/platform_mime_util_mac.mm +++ b/net/base/platform_mime_util_mac.mm @@ -10,7 +10,6 @@ #include "base/mac/foundation_util.h" #include "base/mac/scoped_cftyperef.h" -#import "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" #if defined(OS_IOS) diff --git a/ui/base/cocoa/hover_button.h b/ui/base/cocoa/hover_button.h index e845d08..4040c2c 100644 --- a/ui/base/cocoa/hover_button.h +++ b/ui/base/cocoa/hover_button.h @@ -7,7 +7,6 @@ #import <Cocoa/Cocoa.h> -#import "base/mac/scoped_nsobject.h" #import "ui/base/cocoa/tracking_area.h" #import "ui/base/ui_export.h" diff --git a/webkit/common/cursors/webcursor_mac.mm b/webkit/common/cursors/webcursor_mac.mm index 65e4dd5..0abc3e9 100644 --- a/webkit/common/cursors/webcursor_mac.mm +++ b/webkit/common/cursors/webcursor_mac.mm @@ -9,7 +9,6 @@ #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" -#include "base/mac/scoped_nsobject.h" #include "grit/webkit_chromium_resources.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/WebKit/public/platform/WebSize.h" |