diff options
Diffstat (limited to 'chrome/browser/ui/cocoa')
66 files changed, 145 insertions, 149 deletions
diff --git a/chrome/browser/ui/cocoa/about_ipc_controller.mm b/chrome/browser/ui/cocoa/about_ipc_controller.mm index f7f7c31..89e0db7 100644 --- a/chrome/browser/ui/cocoa/about_ipc_controller.mm +++ b/chrome/browser/ui/cocoa/about_ipc_controller.mm @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/logging.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/time.h" @@ -86,7 +86,7 @@ AboutIPCController* gSharedController = nil; } - (id)init { - NSString* nibpath = [mac_util::MainAppBundle() pathForResource:@"AboutIPC" + NSString* nibpath = [base::mac::MainAppBundle() pathForResource:@"AboutIPC" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibpath owner:self])) { // Default to all on diff --git a/chrome/browser/ui/cocoa/about_window_controller.mm b/chrome/browser/ui/cocoa/about_window_controller.mm index f6da6ab..d87b5c1 100644 --- a/chrome/browser/ui/cocoa/about_window_controller.mm +++ b/chrome/browser/ui/cocoa/about_window_controller.mm @@ -8,7 +8,7 @@ #include "app/l10n_util_mac.h" #include "app/resource_bundle.h" #include "base/logging.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" @@ -100,7 +100,7 @@ void AttributedStringAppendHyperlink(NSMutableAttributedString* attr_str, @implementation AboutWindowController - (id)initWithProfile:(Profile*)profile { - NSString* nibPath = [mac_util::MainAppBundle() pathForResource:@"About" + NSString* nibPath = [base::mac::MainAppBundle() pathForResource:@"About" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibPath owner:self])) { profile_ = profile; @@ -128,7 +128,7 @@ void AttributedStringAppendHyperlink(NSMutableAttributedString* attr_str, static BOOL recentShownUserActionFailedStatus = NO; - (void)awakeFromNib { - NSBundle* bundle = mac_util::MainAppBundle(); + NSBundle* bundle = base::mac::MainAppBundle(); NSString* chromeVersion = [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"]; diff --git a/chrome/browser/ui/cocoa/animatable_image.mm b/chrome/browser/ui/cocoa/animatable_image.mm index a73f5a4..2d09bf0 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 "base/mac_util.h" +#import "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" @@ -131,7 +131,7 @@ // rasterize PDF resources. - (void)setLayerContents:(CALayer*)layer { base::mac::ScopedCFTypeRef<CGImageRef> image( - mac_util::CopyNSImageToCGImage(image_.get())); + base::mac::CopyNSImageToCGImage(image_.get())); // Create the layer that will be animated. [layer setContents:(id)image.get()]; } diff --git a/chrome/browser/ui/cocoa/authorization_util.mm b/chrome/browser/ui/cocoa/authorization_util.mm index 5893711..9c434f3 100644 --- a/chrome/browser/ui/cocoa/authorization_util.mm +++ b/chrome/browser/ui/cocoa/authorization_util.mm @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/eintr_wrapper.h" #include "base/logging.h" -#import "base/mac_util.h" +#import "base/mac/mac_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "chrome/browser/ui/cocoa/scoped_authorizationref.h" @@ -41,14 +41,14 @@ AuthorizationRef AuthorizationCreateToRunAsRoot(CFStringRef prompt) { // product_logo_32.png is used instead of app.icns because Authorization // Services can't deal with .icns files. NSString* icon_path = - [mac_util::MainAppBundle() pathForResource:@"product_logo_32" + [base::mac::MainAppBundle() pathForResource:@"product_logo_32" ofType:@"png"]; const char* icon_path_c = [icon_path fileSystemRepresentation]; size_t icon_path_length = icon_path_c ? strlen(icon_path_c) : 0; // The OS will append " Type an administrator's name and password to allow // <CFBundleDisplayName> to make changes." - NSString* prompt_ns = mac_util::CFToNSCast(prompt); + NSString* prompt_ns = base::mac::CFToNSCast(prompt); const char* prompt_c = [prompt_ns UTF8String]; size_t prompt_length = prompt_c ? strlen(prompt_c) : 0; diff --git a/chrome/browser/ui/cocoa/base_bubble_controller.mm b/chrome/browser/ui/cocoa/base_bubble_controller.mm index 3c1e9d2..768e9f1 100644 --- a/chrome/browser/ui/cocoa/base_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/base_bubble_controller.mm @@ -6,7 +6,7 @@ #include "app/l10n_util.h" #include "base/logging.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/scoped_nsobject.h" #include "base/string_util.h" #import "chrome/browser/ui/cocoa/info_bubble_view.h" @@ -54,7 +54,7 @@ class Bridge : public NotificationObserver { - (id)initWithWindowNibPath:(NSString*)nibPath parentWindow:(NSWindow*)parentWindow anchoredAt:(NSPoint)anchoredAt { - nibPath = [mac_util::MainAppBundle() pathForResource:nibPath + nibPath = [base::mac::MainAppBundle() pathForResource:nibPath ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibPath owner:self])) { parentWindow_ = parentWindow; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index c08aae0..261c742 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -6,7 +6,7 @@ #include "app/l10n_util_mac.h" #include "app/resource_bundle.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_editor.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -211,7 +211,7 @@ const NSTimeInterval kBookmarkBarAnimationDuration = 0.12; delegate:(id<BookmarkBarControllerDelegate>)delegate resizeDelegate:(id<ViewResizer>)resizeDelegate { if ((self = [super initWithNibName:@"BookmarkBar" - bundle:mac_util::MainAppBundle()])) { + bundle:base::mac::MainAppBundle()])) { // Initialize to an invalid state. visualState_ = bookmarks::kInvalidState; lastVisualState_ = bookmarks::kInvalidState; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm index b86aab9..86420c2 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h" #include "app/mac/nsimage_cache.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" @@ -114,7 +114,7 @@ const CGFloat kScrollWindowVerticalMargin = 0.0; parentController:(BookmarkBarFolderController*)parentController barController:(BookmarkBarController*)barController { NSString* nibPath = - [mac_util::MainAppBundle() pathForResource:@"BookmarkBarFolderWindow" + [base::mac::MainAppBundle() pathForResource:@"BookmarkBarFolderWindow" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibPath owner:self])) { parentButton_.reset([button retain]); diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm index ae66081..82258da 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h" #include "app/l10n_util_mac.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" // TODO(viettrungluu): remove #include "chrome/browser/bookmarks/bookmark_model.h" @@ -88,7 +88,7 @@ void BookmarkBubbleNotificationBridge::Observe( node:(const BookmarkNode*)node alreadyBookmarked:(BOOL)alreadyBookmarked { NSString* nibPath = - [mac_util::MainAppBundle() pathForResource:@"BookmarkBubble" + [base::mac::MainAppBundle() pathForResource:@"BookmarkBubble" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibPath owner:self])) { parentWindow_ = parentWindow; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm index ffc9d69..8cce1b4 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm @@ -9,7 +9,7 @@ #include "app/l10n_util.h" #include "app/l10n_util_mac.h" #include "base/logging.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/profiles/profile.h" @@ -161,7 +161,7 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver { profile:(Profile*)profile parent:(const BookmarkNode*)parent configuration:(BookmarkEditor::Configuration)configuration { - NSString* nibpath = [mac_util::MainAppBundle() + NSString* nibpath = [base::mac::MainAppBundle() pathForResource:nibName ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibpath owner:self])) { diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm index b4f23d2..4db77eb 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm @@ -6,7 +6,7 @@ #include "app/l10n_util.h" #include "app/l10n_util_mac.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h" @@ -20,7 +20,7 @@ node:(const BookmarkNode*)node parent:(const BookmarkNode*)parent newIndex:(int)newIndex { - NSString* nibpath = [mac_util::MainAppBundle() + NSString* nibpath = [base::mac::MainAppBundle() pathForResource:@"BookmarkNameFolder" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibpath owner:self])) { diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index 589ed91..6240065 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm @@ -10,7 +10,7 @@ #include "app/l10n_util_mac.h" #include "app/mac/scoped_nsdisable_screen_updates.h" #include "app/mac/nsimage_cache.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #import "base/scoped_nsobject.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" // IDC_* @@ -219,7 +219,7 @@ - (id)initWithBrowser:(Browser*)browser takeOwnership:(BOOL)ownIt { // Use initWithWindowNibPath:: instead of initWithWindowNibName: so we // can override it in a unit test. - NSString* nibpath = [mac_util::MainAppBundle() + NSString* nibpath = [base::mac::MainAppBundle() pathForResource:@"BrowserWindow" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibpath owner:self])) { diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm index 702c52b..98f1718 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" -#include "base/mac_util.h" #import "base/scoped_nsobject.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/ui/cocoa/bug_report_window_controller.mm b/chrome/browser/ui/cocoa/bug_report_window_controller.mm index 82b3a36..5ea378a 100644 --- a/chrome/browser/ui/cocoa/bug_report_window_controller.mm +++ b/chrome/browser/ui/cocoa/bug_report_window_controller.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/bug_report_window_controller.h" #include "app/l10n_util_mac.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bug_report_util.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -26,7 +26,7 @@ - (id)initWithTabContents:(TabContents*)currentTab profile:(Profile*)profile { - NSString* nibpath = [mac_util::MainAppBundle() pathForResource:@"ReportBug" + NSString* nibpath = [base::mac::MainAppBundle() pathForResource:@"ReportBug" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibpath owner:self])) { currentTab_ = currentTab; @@ -62,7 +62,7 @@ [self setPageURL:base::SysUTF8ToNSString( currentTab_->controller().GetActiveEntry()->url().spec())]; [self setPageTitle:base::SysUTF16ToNSString(currentTab_->GetTitle())]; - mac_util::GrabWindowSnapshot( + base::mac::GrabWindowSnapshot( currentTab_->view()->GetTopLevelNativeWindow(), &pngData_, &pngWidth_, &pngHeight_); } else { 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 9cbb8e0..f2fd657 100644 --- a/chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm +++ b/chrome/browser/ui/cocoa/chrome_event_processing_window_unittest.mm @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <Carbon/Carbon.h> + #include "base/debug/debugger.h" #include "base/scoped_nsobject.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/ui/cocoa/clear_browsing_data_controller.mm b/chrome/browser/ui/cocoa/clear_browsing_data_controller.mm index c0c927e..0ced443 100644 --- a/chrome/browser/ui/cocoa/clear_browsing_data_controller.mm +++ b/chrome/browser/ui/cocoa/clear_browsing_data_controller.mm @@ -6,7 +6,7 @@ #include "app/l10n_util.h" #include "base/lazy_instance.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/scoped_nsobject.h" #include "chrome/browser/browsing_data_remover.h" #include "chrome/browser/prefs/pref_service.h" @@ -98,7 +98,7 @@ static base::LazyInstance<ProfileControllerMap> g_profile_controller_map( DCHECK(profile); // Use initWithWindowNibPath:: instead of initWithWindowNibName: so we // can override it in a unit test. - NSString *nibpath = [mac_util::MainAppBundle() + NSString *nibpath = [base::mac::MainAppBundle() pathForResource:@"ClearBrowsingData" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibpath owner:self])) { diff --git a/chrome/browser/ui/cocoa/cocoa_test_helper.h b/chrome/browser/ui/cocoa/cocoa_test_helper.h index f6c9bb8..d7eb150 100644 --- a/chrome/browser/ui/cocoa/cocoa_test_helper.h +++ b/chrome/browser/ui/cocoa/cocoa_test_helper.h @@ -8,7 +8,6 @@ #import <Cocoa/Cocoa.h> -#include "base/mac_util.h" #include "base/path_service.h" #import "base/mac/scoped_nsautorelease_pool.h" #import "base/scoped_nsobject.h" diff --git a/chrome/browser/ui/cocoa/cocoa_test_helper.mm b/chrome/browser/ui/cocoa/cocoa_test_helper.mm index 2cd2cc0..b4c68d9 100644 --- a/chrome/browser/ui/cocoa/cocoa_test_helper.mm +++ b/chrome/browser/ui/cocoa/cocoa_test_helper.mm @@ -6,6 +6,7 @@ #include "base/debug/debugger.h" #include "base/logging.h" +#include "base/mac/mac_util.h" #include "base/test/test_timeouts.h" #import "chrome/browser/chrome_browser_application_mac.h" @@ -79,7 +80,7 @@ void CocoaTest::BootstrapCocoa() { FilePath path; PathService::Get(base::DIR_EXE, &path); path = path.Append(chrome::kFrameworkName); - mac_util::SetOverrideAppBundlePath(path); + base::mac::SetOverrideAppBundlePath(path); // Bootstrap Cocoa. It's very unhappy without this. [CrApplication sharedApplication]; @@ -131,7 +132,8 @@ void CocoaTest::TearDown() { (spins < kCloseSpins || one_more_time)) { // Check the timeout before pumping events, so that we'll spin // the loop once after the timeout. - one_more_time = ([start_date timeIntervalSinceNow] > -kCloseTimeoutSeconds); + one_more_time = + ([start_date timeIntervalSinceNow] > -kCloseTimeoutSeconds); // Autorelease anything thrown up by the event loop. { diff --git a/chrome/browser/ui/cocoa/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/collected_cookies_mac.mm index 23ff4a5..ef19437 100644 --- a/chrome/browser/ui/cocoa/collected_cookies_mac.mm +++ b/chrome/browser/ui/cocoa/collected_cookies_mac.mm @@ -8,7 +8,7 @@ #include "app/l10n_util_mac.h" #include "app/resource_bundle.h" -#import "base/mac_util.h" +#import "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -137,7 +137,7 @@ void CollectedCookiesMac::OnSheetDidEnd(NSWindow* sheet) { tabContents_ = tabContents; NSString* nibpath = - [mac_util::MainAppBundle() pathForResource:@"CollectedCookies" + [base::mac::MainAppBundle() pathForResource:@"CollectedCookies" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibpath owner:self])) { [self loadTreeModelFromTabContents]; diff --git a/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm b/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm index 548b83a..6ad363b 100644 --- a/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm +++ b/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm @@ -6,7 +6,7 @@ #import <QuartzCore/QuartzCore.h> #include "base/logging.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/confirm_quit_panel_controller.h" @@ -29,7 +29,7 @@ ConfirmQuitPanelController* g_confirmQuitPanelController = nil; - (id)initInternal { NSString* nibPath = - [mac_util::MainAppBundle() pathForResource:@"ConfirmQuitPanel" + [base::mac::MainAppBundle() pathForResource:@"ConfirmQuitPanel" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibPath owner:self])) { } diff --git a/chrome/browser/ui/cocoa/content_exceptions_window_controller.mm b/chrome/browser/ui/cocoa/content_exceptions_window_controller.mm index e9a426f6..eaced8e 100644 --- a/chrome/browser/ui/cocoa/content_exceptions_window_controller.mm +++ b/chrome/browser/ui/cocoa/content_exceptions_window_controller.mm @@ -8,7 +8,7 @@ #include "app/l10n_util_mac.h" #include "app/table_model_observer.h" #include "base/command_line.h" -#import "base/mac_util.h" +#import "base/mac/mac_util.h" #import "base/scoped_nsobject.h" #include "base/sys_string_conversions.h" #include "chrome/browser/content_exceptions_table_model.h" @@ -151,7 +151,7 @@ static ContentExceptionsWindowController* settingsMap:(HostContentSettingsMap*)settingsMap otrSettingsMap:(HostContentSettingsMap*)otrSettingsMap { NSString* nibpath = - [mac_util::MainAppBundle() pathForResource:@"ContentExceptionsWindow" + [base::mac::MainAppBundle() pathForResource:@"ContentExceptionsWindow" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibpath owner:self])) { settingsType_ = settingsType; diff --git a/chrome/browser/ui/cocoa/content_settings_dialog_controller.mm b/chrome/browser/ui/cocoa/content_settings_dialog_controller.mm index f61c77a..1fb432e 100644 --- a/chrome/browser/ui/cocoa/content_settings_dialog_controller.mm +++ b/chrome/browser/ui/cocoa/content_settings_dialog_controller.mm @@ -8,7 +8,7 @@ #include "app/l10n_util.h" #include "base/command_line.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #import "chrome/browser/content_settings/content_settings_details.h" #import "chrome/browser/content_settings/host_content_settings_map.h" #import "chrome/browser/geolocation/geolocation_content_settings_map.h" @@ -145,7 +145,7 @@ class PrefObserverDisabler { - (id)initWithProfile:(Profile*)profile { DCHECK(profile); NSString* nibpath = - [mac_util::MainAppBundle() pathForResource:@"ContentSettings" + [base::mac::MainAppBundle() pathForResource:@"ContentSettings" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibpath owner:self])) { profile_ = profile; diff --git a/chrome/browser/ui/cocoa/cookie_details_view_controller.mm b/chrome/browser/ui/cocoa/cookie_details_view_controller.mm index 9f47a54..d3e1ea5 100644 --- a/chrome/browser/ui/cocoa/cookie_details_view_controller.mm +++ b/chrome/browser/ui/cocoa/cookie_details_view_controller.mm @@ -6,7 +6,7 @@ #include "app/l10n_util_mac.h" #include "app/resource_bundle.h" -#import "base/mac_util.h" +#import "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/cookie_tree_node.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" @@ -22,7 +22,7 @@ static const int kExtraMarginBelowWhenExpirationEditable = 5; - (id)init { return [super initWithNibName:@"CookieDetailsView" - bundle:mac_util::MainAppBundle()]; + bundle:base::mac::MainAppBundle()]; } - (void)awakeFromNib { diff --git a/chrome/browser/ui/cocoa/cookies_window_controller.mm b/chrome/browser/ui/cocoa/cookies_window_controller.mm index bf1bf68..5e5f74f 100644 --- a/chrome/browser/ui/cocoa/cookies_window_controller.mm +++ b/chrome/browser/ui/cocoa/cookies_window_controller.mm @@ -9,7 +9,7 @@ #include "app/l10n_util_mac.h" #include "app/resource_bundle.h" -#import "base/mac_util.h" +#import "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/browsing_data_remover.h" #include "chrome/browser/profiles/profile.h" @@ -168,7 +168,7 @@ bool CookiesTreeModelObserverBridge::HasCocoaModel() { appcacheHelper:(BrowsingDataAppCacheHelper*)appcacheHelper indexedDBHelper:(BrowsingDataIndexedDBHelper*)indexedDBHelper { DCHECK(profile); - NSString* nibpath = [mac_util::MainAppBundle() pathForResource:@"Cookies" + NSString* nibpath = [base::mac::MainAppBundle() pathForResource:@"Cookies" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibpath owner:self])) { profile_ = profile; diff --git a/chrome/browser/ui/cocoa/download/download_item_cell.mm b/chrome/browser/ui/cocoa/download/download_item_cell.mm index d2a8335..db5d5fa 100644 --- a/chrome/browser/ui/cocoa/download/download_item_cell.mm +++ b/chrome/browser/ui/cocoa/download/download_item_cell.mm @@ -6,7 +6,6 @@ #include "app/l10n_util.h" #include "app/text_elider.h" -#include "base/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_item_model.h" diff --git a/chrome/browser/ui/cocoa/download/download_item_controller.mm b/chrome/browser/ui/cocoa/download/download_item_controller.mm index be0be80..23603f8 100644 --- a/chrome/browser/ui/cocoa/download/download_item_controller.mm +++ b/chrome/browser/ui/cocoa/download/download_item_controller.mm @@ -7,7 +7,7 @@ #include "app/l10n_util_mac.h" #include "app/resource_bundle.h" #include "app/text_elider.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/metrics/histogram.h" #include "base/string16.h" #include "base/string_util.h" @@ -98,7 +98,7 @@ class DownloadShelfContextMenuMac : public DownloadShelfContextMenu { - (id)initWithModel:(BaseDownloadItemModel*)downloadModel shelf:(DownloadShelfController*)shelf { if ((self = [super initWithNibName:@"DownloadItem" - bundle:mac_util::MainAppBundle()])) { + bundle:base::mac::MainAppBundle()])) { // Must be called before [self view], so that bridge_ is set in awakeFromNib bridge_.reset(new DownloadItemMac(downloadModel, self)); menuBridge_.reset(new DownloadShelfContextMenuMac(downloadModel)); diff --git a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm index 4238b98..f88071f 100644 --- a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm +++ b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm @@ -6,7 +6,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_manager.h" @@ -83,7 +83,7 @@ const NSTimeInterval kAutoCloseDelaySeconds = 5; - (id)initWithBrowser:(Browser*)browser resizeDelegate:(id<ViewResizer>)resizeDelegate { if ((self = [super initWithNibName:@"DownloadShelf" - bundle:mac_util::MainAppBundle()])) { + bundle:base::mac::MainAppBundle()])) { resizeDelegate_ = resizeDelegate; maxShelfHeight_ = NSHeight([[self view] bounds]); currentShelfHeight_ = maxShelfHeight_; diff --git a/chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller.mm b/chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller.mm index 06fc94b..7d83c74 100644 --- a/chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller.mm @@ -7,7 +7,7 @@ #include "app/l10n_util_mac.h" #include "app/resource_bundle.h" #include "base/logging.h" -#import "base/mac_util.h" +#import "base/mac/mac_util.h" #include "base/string16.h" #include "base/sys_string_conversions.h" #include "chrome/browser/search_engines/template_url.h" @@ -32,7 +32,7 @@ void ShiftOriginY(NSView* view, CGFloat amount) { delegate:(EditSearchEngineControllerDelegate*)delegate templateURL:(const TemplateURL*)url { DCHECK(profile); - NSString* nibpath = [mac_util::MainAppBundle() + NSString* nibpath = [base::mac::MainAppBundle() pathForResource:@"EditSearchEngine" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibpath owner:self])) { diff --git a/chrome/browser/ui/cocoa/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extension_installed_bubble_controller.mm index f417ff7..ad30096 100644 --- a/chrome/browser/ui/cocoa/extension_installed_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/extension_installed_bubble_controller.mm @@ -6,7 +6,7 @@ #include "app/l10n_util.h" #include "base/i18n/rtl.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" @@ -80,7 +80,7 @@ class ExtensionLoadedNotificationObserver : public NotificationObserver { browser:(Browser*)browser icon:(SkBitmap)icon { NSString* nibPath = - [mac_util::MainAppBundle() pathForResource:@"ExtensionInstalledBubble" + [base::mac::MainAppBundle() pathForResource:@"ExtensionInstalledBubble" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibPath owner:self])) { DCHECK(parentWindow); diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_controller.mm index e40fcd4..09dc927 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_controller.mm @@ -6,7 +6,7 @@ #include "app/l10n_util.h" #include "app/l10n_util_mac.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" @@ -67,11 +67,11 @@ void OffsetControlVertically(NSControl* control, CGFloat amount) { // We use a different XIB in the case of no warnings, that is a little bit // more nicely laid out. if (warnings.empty()) { - nibpath = [mac_util::MainAppBundle() + nibpath = [base::mac::MainAppBundle() pathForResource:@"ExtensionInstallPromptNoWarnings" ofType:@"nib"]; } else { - nibpath = [mac_util::MainAppBundle() + nibpath = [base::mac::MainAppBundle() pathForResource:@"ExtensionInstallPrompt" ofType:@"nib"]; } diff --git a/chrome/browser/ui/cocoa/file_metadata.mm b/chrome/browser/ui/cocoa/file_metadata.mm index d19e3ac..ca199a5 100644 --- a/chrome/browser/ui/cocoa/file_metadata.mm +++ b/chrome/browser/ui/cocoa/file_metadata.mm @@ -9,7 +9,7 @@ #include "base/file_path.h" #include "base/logging.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "googleurl/src/gurl.h" @@ -98,7 +98,7 @@ void AddOriginMetadataToFile(const FilePath& file, const GURL& source, void AddQuarantineMetadataToFile(const FilePath& file, const GURL& source, const GURL& referrer) { FSRef file_ref; - if (!mac_util::FSRefFromPath(file.value(), &file_ref)) + if (!base::mac::FSRefFromPath(file.value(), &file_ref)) return; NSMutableDictionary* quarantine_properties = nil; diff --git a/chrome/browser/ui/cocoa/find_bar_cocoa_controller.mm b/chrome/browser/ui/cocoa/find_bar_cocoa_controller.mm index 05e5397..f8a40442 100644 --- a/chrome/browser/ui/cocoa/find_bar_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/find_bar_cocoa_controller.mm @@ -4,7 +4,7 @@ #import <Cocoa/Cocoa.h> -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -42,7 +42,7 @@ const float kFindBarCloseDuration = 0.15; - (id)init { if ((self = [super initWithNibName:@"FindBar" - bundle:mac_util::MainAppBundle()])) { + bundle:base::mac::MainAppBundle()])) { [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(findPboardUpdated:) diff --git a/chrome/browser/ui/cocoa/first_run_dialog.mm b/chrome/browser/ui/cocoa/first_run_dialog.mm index 9590b9b..ed5d5b0 100644 --- a/chrome/browser/ui/cocoa/first_run_dialog.mm +++ b/chrome/browser/ui/cocoa/first_run_dialog.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/first_run_dialog.h" #include "app/l10n_util_mac.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/message_loop.h" #include "base/ref_counted.h" #include "grit/locale_settings.h" @@ -58,7 +58,7 @@ void FirstRunShowBridge::ShowDialog() { - (id)init { NSString* nibpath = - [mac_util::MainAppBundle() pathForResource:@"FirstRunDialog" + [base::mac::MainAppBundle() pathForResource:@"FirstRunDialog" ofType:@"nib"]; self = [super initWithWindowNibPath:nibpath owner:self]; if (self != nil) { diff --git a/chrome/browser/ui/cocoa/floating_bar_backing_view.mm b/chrome/browser/ui/cocoa/floating_bar_backing_view.mm index 70f785c..695946f 100644 --- a/chrome/browser/ui/cocoa/floating_bar_backing_view.mm +++ b/chrome/browser/ui/cocoa/floating_bar_backing_view.mm @@ -4,7 +4,7 @@ #include "chrome/browser/ui/cocoa/floating_bar_backing_view.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #import "chrome/browser/ui/cocoa/browser_frame_view.h" @implementation FloatingBarBackingView @@ -44,7 +44,7 @@ // a double-click in the blank area should try to minimize, to be consistent // with double-clicks on the contiguous tab strip area. (It'll fail and beep.) if ([event clickCount] == 2 && - mac_util::ShouldWindowsMiniaturizeOnDoubleClick()) + base::mac::ShouldWindowsMiniaturizeOnDoubleClick()) [[self window] performMiniaturize:self]; } diff --git a/chrome/browser/ui/cocoa/font_language_settings_controller.mm b/chrome/browser/ui/cocoa/font_language_settings_controller.mm index 4beff2a..9bb9c6b 100644 --- a/chrome/browser/ui/cocoa/font_language_settings_controller.mm +++ b/chrome/browser/ui/cocoa/font_language_settings_controller.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/font_language_settings_controller.h" #import <Cocoa/Cocoa.h> -#import "base/mac_util.h" +#import "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/character_encoding.h" #include "chrome/browser/fonts_languages_window.h" @@ -33,7 +33,7 @@ void ShowFontsLanguagesWindow(gfx::NativeWindow window, - (id)initWithProfile:(Profile*)profile { DCHECK(profile); - NSString* nibpath = [mac_util::MainAppBundle() + NSString* nibpath = [base::mac::MainAppBundle() pathForResource:@"FontLanguageSettings" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibpath owner:self])) { diff --git a/chrome/browser/ui/cocoa/fullscreen_controller.h b/chrome/browser/ui/cocoa/fullscreen_controller.h index 474d699..14aebfc 100644 --- a/chrome/browser/ui/cocoa/fullscreen_controller.h +++ b/chrome/browser/ui/cocoa/fullscreen_controller.h @@ -9,7 +9,7 @@ #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" @class BrowserWindowController; @@ -69,7 +69,7 @@ // (which can happen when a fullscreen window is closed). Used to track the // current state and make sure we properly restore the menu bar when this // controller is destroyed. - mac_util::FullScreenMode currentFullscreenMode_; + base::mac::FullScreenMode currentFullscreenMode_; } @property(readonly, nonatomic) BOOL isFullscreen; diff --git a/chrome/browser/ui/cocoa/fullscreen_controller.mm b/chrome/browser/ui/cocoa/fullscreen_controller.mm index 0f06e22..186ea78 100644 --- a/chrome/browser/ui/cocoa/fullscreen_controller.mm +++ b/chrome/browser/ui/cocoa/fullscreen_controller.mm @@ -6,6 +6,7 @@ #include <algorithm> +#import "base/mac/mac_util.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" @@ -102,7 +103,7 @@ const CGFloat kFloatingBarVerticalOffset = 22; // Returns |kFullScreenModeHideAll| when the overlay is hidden and // |kFullScreenModeHideDock| when the overlay is shown. -- (mac_util::FullScreenMode)desiredFullscreenMode; +- (base::mac::FullScreenMode)desiredFullscreenMode; // Change the overlay to the given fraction, with or without animation. Only // guaranteed to work properly with |fraction == 0| or |fraction == 1|. This @@ -166,7 +167,7 @@ const CGFloat kFloatingBarVerticalOffset = 22; - (id)initWithBrowserController:(BrowserWindowController*)controller { if ((self == [super init])) { browserController_ = controller; - currentFullscreenMode_ = mac_util::kFullScreenModeNormal; + currentFullscreenMode_ = base::mac::kFullScreenModeNormal; } // Let the world know what we're up to. @@ -315,12 +316,12 @@ const CGFloat kFloatingBarVerticalOffset = 22; - (void)changeFloatingBarShownFraction:(CGFloat)fraction { [browserController_ setFloatingBarShownFraction:fraction]; - mac_util::FullScreenMode desiredMode = [self desiredFullscreenMode]; + base::mac::FullScreenMode desiredMode = [self desiredFullscreenMode]; if (desiredMode != currentFullscreenMode_ && [self shouldToggleMenuBar]) { - if (currentFullscreenMode_ == mac_util::kFullScreenModeNormal) - mac_util::RequestFullScreen(desiredMode); + if (currentFullscreenMode_ == base::mac::kFullScreenModeNormal) + base::mac::RequestFullScreen(desiredMode); else - mac_util::SwitchFullScreenModes(currentFullscreenMode_, desiredMode); + base::mac::SwitchFullScreenModes(currentFullscreenMode_, desiredMode); currentFullscreenMode_ = desiredMode; } } @@ -405,10 +406,10 @@ const CGFloat kFloatingBarVerticalOffset = 22; [[browserController_ window] isMainWindow]; } -- (mac_util::FullScreenMode)desiredFullscreenMode { +- (base::mac::FullScreenMode)desiredFullscreenMode { if ([browserController_ floatingBarShownFraction] >= 1.0) - return mac_util::kFullScreenModeHideDock; - return mac_util::kFullScreenModeHideAll; + return base::mac::kFullScreenModeHideDock; + return base::mac::kFullScreenModeHideAll; } - (void)changeOverlayToFraction:(CGFloat)fraction @@ -608,13 +609,13 @@ const CGFloat kFloatingBarVerticalOffset = 22; } - (void)showActiveWindowUI { - DCHECK_EQ(currentFullscreenMode_, mac_util::kFullScreenModeNormal); - if (currentFullscreenMode_ != mac_util::kFullScreenModeNormal) + DCHECK_EQ(currentFullscreenMode_, base::mac::kFullScreenModeNormal); + if (currentFullscreenMode_ != base::mac::kFullScreenModeNormal) return; if ([self shouldToggleMenuBar]) { - mac_util::FullScreenMode desiredMode = [self desiredFullscreenMode]; - mac_util::RequestFullScreen(desiredMode); + base::mac::FullScreenMode desiredMode = [self desiredFullscreenMode]; + base::mac::RequestFullScreen(desiredMode); currentFullscreenMode_ = desiredMode; } @@ -622,9 +623,9 @@ const CGFloat kFloatingBarVerticalOffset = 22; } - (void)hideActiveWindowUI { - if (currentFullscreenMode_ != mac_util::kFullScreenModeNormal) { - mac_util::ReleaseFullScreen(currentFullscreenMode_); - currentFullscreenMode_ = mac_util::kFullScreenModeNormal; + if (currentFullscreenMode_ != base::mac::kFullScreenModeNormal) { + base::mac::ReleaseFullScreen(currentFullscreenMode_); + currentFullscreenMode_ = base::mac::kFullScreenModeNormal; } // TODO(rohitrao): Remove the Exit Fullscreen button. http://crbug.com/35956 diff --git a/chrome/browser/ui/cocoa/fullscreen_window.mm b/chrome/browser/ui/cocoa/fullscreen_window.mm index ecbb34c..ee4b881 100644 --- a/chrome/browser/ui/cocoa/fullscreen_window.mm +++ b/chrome/browser/ui/cocoa/fullscreen_window.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/fullscreen_window.h" -#include "base/mac_util.h" #include "chrome/browser/themes/browser_theme_provider.h" #import "chrome/browser/ui/cocoa/themed_window.h" diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.mm b/chrome/browser/ui/cocoa/hung_renderer_controller.mm index 130a3f7..2c9d337 100644 --- a/chrome/browser/ui/cocoa/hung_renderer_controller.mm +++ b/chrome/browser/ui/cocoa/hung_renderer_controller.mm @@ -8,7 +8,7 @@ #include "app/resource_bundle.h" #include "app/l10n_util_mac.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/process_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/browser_list.h" @@ -35,7 +35,7 @@ HungRendererController* g_instance = NULL; @implementation HungRendererController - (id)initWithWindowNibName:(NSString*)nibName { - NSString* nibpath = [mac_util::MainAppBundle() pathForResource:nibName + NSString* nibpath = [base::mac::MainAppBundle() pathForResource:nibName ofType:@"nib"]; self = [super initWithWindowNibPath:nibpath owner:self]; if (self) { diff --git a/chrome/browser/ui/cocoa/import_progress_dialog.mm b/chrome/browser/ui/cocoa/import_progress_dialog.mm index 6ec0ed5..fe82f1f 100644 --- a/chrome/browser/ui/cocoa/import_progress_dialog.mm +++ b/chrome/browser/ui/cocoa/import_progress_dialog.mm @@ -7,7 +7,7 @@ #include "app/l10n_util.h" #include "app/l10n_util_mac.h" #include "base/logging.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/message_loop.h" #import "base/scoped_nsobject.h" #import "base/sys_string_conversions.h" @@ -57,7 +57,7 @@ NSString* keyForImportItem(importer::ImportItem item) { observer:(ImportObserver*)observer itemsEnabled:(int16)items { NSString* nib_path = - [mac_util::MainAppBundle() pathForResource:@"ImportProgressDialog" + [base::mac::MainAppBundle() pathForResource:@"ImportProgressDialog" ofType:@"nib"]; self = [super initWithWindowNibPath:nib_path owner:self]; if (self != nil) { diff --git a/chrome/browser/ui/cocoa/import_settings_dialog.mm b/chrome/browser/ui/cocoa/import_settings_dialog.mm index 5e6da7a..d395999 100644 --- a/chrome/browser/ui/cocoa/import_settings_dialog.mm +++ b/chrome/browser/ui/cocoa/import_settings_dialog.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/import_settings_dialog.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/importer/importer_list.h" @@ -140,7 +140,7 @@ bool importSettingsDialogVisible = false; - (id)initWithProfiles:(NSArray*)profiles { NSString* nibpath = - [mac_util::MainAppBundle() pathForResource:@"ImportSettingsDialog" + [base::mac::MainAppBundle() pathForResource:@"ImportSettingsDialog" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibpath owner:self])) { sourceBrowsersList_.reset([profiles retain]); diff --git a/chrome/browser/ui/cocoa/importer_lock_dialog.mm b/chrome/browser/ui/cocoa/importer_lock_dialog.mm index cc94ce5..2a140ae 100644 --- a/chrome/browser/ui/cocoa/importer_lock_dialog.mm +++ b/chrome/browser/ui/cocoa/importer_lock_dialog.mm @@ -7,7 +7,6 @@ #import "importer_lock_dialog.h" #include "app/l10n_util_mac.h" -#include "base/mac_util.h" #include "base/message_loop.h" #include "base/scoped_nsobject.h" #include "chrome/browser/importer/importer.h" diff --git a/chrome/browser/ui/cocoa/infobar_container_controller.mm b/chrome/browser/ui/cocoa/infobar_container_controller.mm index adca3e7..3eb29dc 100644 --- a/chrome/browser/ui/cocoa/infobar_container_controller.mm +++ b/chrome/browser/ui/cocoa/infobar_container_controller.mm @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/logging.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/browser/tab_contents/tab_contents.h" #import "chrome/browser/ui/cocoa/animatable_view.h" @@ -71,7 +71,7 @@ class InfoBarNotificationObserver : public NotificationObserver { - (id)initWithResizeDelegate:(id<ViewResizer>)resizeDelegate { DCHECK(resizeDelegate); if ((self = [super initWithNibName:@"InfoBarContainer" - bundle:mac_util::MainAppBundle()])) { + bundle:base::mac::MainAppBundle()])) { resizeDelegate_ = resizeDelegate; infoBarObserver_.reset(new InfoBarNotificationObserver(self)); diff --git a/chrome/browser/ui/cocoa/infobar_controller.mm b/chrome/browser/ui/cocoa/infobar_controller.mm index ae1414c..432c00b 100644 --- a/chrome/browser/ui/cocoa/infobar_controller.mm +++ b/chrome/browser/ui/cocoa/infobar_controller.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "base/logging.h" // for NOTREACHED() -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/tab_contents/infobar_delegate.h" #import "chrome/browser/ui/cocoa/animatable_view.h" @@ -101,7 +101,7 @@ const float kAnimateCloseDuration = 0.12; - (id)initWithDelegate:(InfoBarDelegate*)delegate { DCHECK(delegate); if ((self = [super initWithNibName:@"InfoBar" - bundle:mac_util::MainAppBundle()])) { + bundle:base::mac::MainAppBundle()])) { delegate_ = delegate; } return self; diff --git a/chrome/browser/ui/cocoa/install_from_dmg.mm b/chrome/browser/ui/cocoa/install_from_dmg.mm index d18e257..aa892cf 100644 --- a/chrome/browser/ui/cocoa/install_from_dmg.mm +++ b/chrome/browser/ui/cocoa/install_from_dmg.mm @@ -18,7 +18,7 @@ #include "base/basictypes.h" #include "base/command_line.h" #include "base/logging.h" -#import "base/mac_util.h" +#import "base/mac/mac_util.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "chrome/browser/ui/cocoa/authorization_util.h" #include "chrome/browser/ui/cocoa/scoped_authorizationref.h" @@ -409,7 +409,7 @@ bool MaybeInstallFromDiskImage() { } NSString* installer_path = - [mac_util::MainAppBundle() pathForResource:@"install" ofType:@"sh"]; + [base::mac::MainAppBundle() pathForResource:@"install" ofType:@"sh"]; if (!installer_path) { VLOG(1) << "Could not locate install.sh"; return false; diff --git a/chrome/browser/ui/cocoa/instant_confirm_window_controller.mm b/chrome/browser/ui/cocoa/instant_confirm_window_controller.mm index 299fd35..07405d6 100644 --- a/chrome/browser/ui/cocoa/instant_confirm_window_controller.mm +++ b/chrome/browser/ui/cocoa/instant_confirm_window_controller.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/instant_confirm_window_controller.h" #include "base/logging.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "chrome/browser/instant/instant_confirm_dialog.h" #include "chrome/browser/instant/instant_controller.h" #include "chrome/browser/profiles/profile.h" @@ -31,7 +31,7 @@ void ShowInstantConfirmDialog(gfx::NativeWindow parent, Profile* profile) { @implementation InstantConfirmWindowController - (id)initWithProfile:(Profile*)profile { - NSString* nibPath = [mac_util::MainAppBundle() + NSString* nibPath = [base::mac::MainAppBundle() pathForResource:@"InstantConfirm" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibPath owner:self])) { diff --git a/chrome/browser/ui/cocoa/keystone_glue.mm b/chrome/browser/ui/cocoa/keystone_glue.mm index 79e95fc..8ac3daf 100644 --- a/chrome/browser/ui/cocoa/keystone_glue.mm +++ b/chrome/browser/ui/cocoa/keystone_glue.mm @@ -12,7 +12,7 @@ #include "app/l10n_util.h" #import "app/l10n_util_mac.h" #include "base/logging.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "base/sys_string_conversions.h" #include "base/ref_counted.h" @@ -438,9 +438,9 @@ NSString* const kBrandKey = @"KSBrandID"; return NO; // Load the KeystoneRegistration framework bundle if present. It lives - // inside the framework, so use mac_util::MainAppBundle(); + // inside the framework, so use base::mac::MainAppBundle(); NSString* ksrPath = - [[mac_util::MainAppBundle() privateFrameworksPath] + [[base::mac::MainAppBundle() privateFrameworksPath] stringByAppendingPathComponent:@"KeystoneRegistration.framework"]; NSBundle* ksrBundle = [NSBundle bundleWithPath:ksrPath]; [ksrBundle load]; @@ -722,7 +722,7 @@ NSString* const kBrandKey = @"KSBrandID"; // to files and directories. NSFileManager* fileManager = [NSFileManager defaultManager]; NSString* executablePath = [[NSBundle mainBundle] executablePath]; - NSString* frameworkPath = [mac_util::MainAppBundle() bundlePath]; + NSString* frameworkPath = [base::mac::MainAppBundle() bundlePath]; return ![fileManager isWritableFileAtPath:appPath_] || ![fileManager isWritableFileAtPath:executablePath] || ![fileManager isWritableFileAtPath:frameworkPath]; @@ -809,7 +809,7 @@ NSString* const kBrandKey = @"KSBrandID"; // However, preflight operation (and promotion) should only be asynchronous // if the synchronous parameter is NO. NSString* preflightPath = - [mac_util::MainAppBundle() pathForResource:@"keystone_promote_preflight" + [base::mac::MainAppBundle() pathForResource:@"keystone_promote_preflight" ofType:@"sh"]; const char* preflightPathC = [preflightPath fileSystemRepresentation]; const char* userBrandFile = NULL; @@ -895,7 +895,7 @@ NSString* const kBrandKey = @"KSBrandID"; SEL selector = @selector(changePermissionsForPromotionWithTool:); NSString* toolPath = - [mac_util::MainAppBundle() pathForResource:@"keystone_promote_postflight" + [base::mac::MainAppBundle() pathForResource:@"keystone_promote_postflight" ofType:@"sh"]; PerformBridge::PostPerform(self, selector, toolPath); diff --git a/chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.mm b/chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.mm index f8b3aa6..2ae0fa6 100644 --- a/chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.mm @@ -6,7 +6,7 @@ #import "chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h" -#import "base/mac_util.h" +#import "base/mac/mac_util.h" #include "base/lazy_instance.h" #include "base/sys_string_conversions.h" #include "chrome/browser/browser_process.h" @@ -146,7 +146,7 @@ static base::LazyInstance<ProfileControllerMap> g_profile_controller_map( - (id)initWithProfile:(Profile*)profile { DCHECK(profile); - NSString* nibpath = [mac_util::MainAppBundle() + NSString* nibpath = [base::mac::MainAppBundle() pathForResource:@"KeywordEditor" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibpath owner:self])) { diff --git a/chrome/browser/ui/cocoa/location_bar/instant_opt_in_controller.mm b/chrome/browser/ui/cocoa/location_bar/instant_opt_in_controller.mm index 17b0d15..9750caf 100644 --- a/chrome/browser/ui/cocoa/location_bar/instant_opt_in_controller.mm +++ b/chrome/browser/ui/cocoa/location_bar/instant_opt_in_controller.mm @@ -4,13 +4,13 @@ #import "chrome/browser/ui/cocoa/location_bar/instant_opt_in_controller.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" @implementation InstantOptInController - (id)initWithDelegate:(InstantOptInControllerDelegate*)delegate { if ((self = [super initWithNibName:@"InstantOptIn" - bundle:mac_util::MainAppBundle()])) { + bundle:base::mac::MainAppBundle()])) { delegate_ = delegate; } return self; diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm index f0d914e..b7daca6f 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm @@ -8,7 +8,7 @@ #include "app/mac/nsimage_cache.h" #include "app/resource_bundle.h" #import "base/mac/cocoa_protocols.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #import "base/scoped_nsobject.h" #include "base/utf_string_conversions.h" #include "chrome/browser/notifications/balloon.h" @@ -43,7 +43,7 @@ const int kRightMargin = 2; - (id)initWithBalloon:(Balloon*)balloon { NSString* nibpath = - [mac_util::MainAppBundle() pathForResource:@"Notification" + [base::mac::MainAppBundle() pathForResource:@"Notification" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibpath owner:self])) { balloon_ = balloon; diff --git a/chrome/browser/ui/cocoa/nsimage_cache_unittest.mm b/chrome/browser/ui/cocoa/nsimage_cache_unittest.mm index b00fb5b..5425125 100644 --- a/chrome/browser/ui/cocoa/nsimage_cache_unittest.mm +++ b/chrome/browser/ui/cocoa/nsimage_cache_unittest.mm @@ -6,7 +6,7 @@ #include "app/mac/nsimage_cache.h" #include "base/file_path.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/path_service.h" #include "chrome/common/chrome_constants.h" #include "testing/gtest/include/gtest/gtest.h" @@ -24,10 +24,10 @@ class NSImageCacheTest : public PlatformTest { FilePath path; PathService::Get(base::DIR_EXE, &path); path = path.Append(chrome::kFrameworkName); - mac_util::SetOverrideAppBundlePath(path); + base::mac::SetOverrideAppBundlePath(path); } virtual ~NSImageCacheTest() { - mac_util::SetOverrideAppBundle(nil); + base::mac::SetOverrideAppBundle(nil); } }; diff --git a/chrome/browser/ui/cocoa/preferences_window_controller.mm b/chrome/browser/ui/cocoa/preferences_window_controller.mm index d582680..950ec7b 100644 --- a/chrome/browser/ui/cocoa/preferences_window_controller.mm +++ b/chrome/browser/ui/cocoa/preferences_window_controller.mm @@ -10,7 +10,7 @@ #include "app/l10n_util_mac.h" #include "app/resource_bundle.h" #include "base/logging.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/mac/scoped_aedesc.h" #include "base/string16.h" #include "base/string_util.h" @@ -489,7 +489,7 @@ class ManagedPrefsBannerState : public policy::ManagedPrefsBannerBase { DCHECK(profile); // Use initWithWindowNibPath:: instead of initWithWindowNibName: so we // can override it in a unit test. - NSString* nibPath = [mac_util::MainAppBundle() + NSString* nibPath = [base::mac::MainAppBundle() pathForResource:@"Preferences" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibPath owner:self])) { @@ -675,9 +675,10 @@ class ManagedPrefsBannerState : public policy::ManagedPrefsBannerBase { verticalShift += AutoSizeGroup(basicsGroupDefaultBrowser_, kAutoSizeGroupBehaviorVerticalFirstToFit, verticalShift); - verticalShift += AutoSizeGroup(basicsGroupSearchEngine_, - kAutoSizeGroupBehaviorFirstTwoAsRowVerticalToFit, - verticalShift); + verticalShift += AutoSizeGroup( + basicsGroupSearchEngine_, + kAutoSizeGroupBehaviorFirstTwoAsRowVerticalToFit, + verticalShift); verticalShift += AutoSizeGroup(basicsGroupToolbar_, kAutoSizeGroupBehaviorVerticalToFit, verticalShift); diff --git a/chrome/browser/ui/cocoa/previewable_contents_controller.mm b/chrome/browser/ui/cocoa/previewable_contents_controller.mm index 2dfa146..74e29b0 100644 --- a/chrome/browser/ui/cocoa/previewable_contents_controller.mm +++ b/chrome/browser/ui/cocoa/previewable_contents_controller.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/previewable_contents_controller.h" #include "base/logging.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "chrome/browser/tab_contents/tab_contents.h" @implementation PreviewableContentsController @@ -14,7 +14,7 @@ - (id)init { if ((self = [super initWithNibName:@"PreviewableContents" - bundle:mac_util::MainAppBundle()])) { + bundle:base::mac::MainAppBundle()])) { } return self; } diff --git a/chrome/browser/ui/cocoa/sad_tab_controller.mm b/chrome/browser/ui/cocoa/sad_tab_controller.mm index ba0b102..e340a9c 100644 --- a/chrome/browser/ui/cocoa/sad_tab_controller.mm +++ b/chrome/browser/ui/cocoa/sad_tab_controller.mm @@ -4,7 +4,7 @@ #include "chrome/browser/ui/cocoa/sad_tab_controller.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #import "chrome/browser/ui/cocoa/sad_tab_view.h" @implementation SadTabController @@ -12,7 +12,7 @@ - (id)initWithTabContents:(TabContents*)someTabContents superview:(NSView*)superview { if ((self = [super initWithNibName:@"SadTab" - bundle:mac_util::MainAppBundle()])) { + bundle:base::mac::MainAppBundle()])) { tabContents_ = someTabContents; NSView* view = [self view]; diff --git a/chrome/browser/ui/cocoa/search_engine_dialog_controller.mm b/chrome/browser/ui/cocoa/search_engine_dialog_controller.mm index 2a79e09..fa53295 100644 --- a/chrome/browser/ui/cocoa/search_engine_dialog_controller.mm +++ b/chrome/browser/ui/cocoa/search_engine_dialog_controller.mm @@ -8,7 +8,7 @@ #include "app/l10n_util_mac.h" #include "app/resource_bundle.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "base/time.h" #include "chrome/browser/profiles/profile.h" @@ -68,7 +68,7 @@ void SearchEngineDialogControllerBridge::OnTemplateURLModelChanged() { - (id)init { NSString* nibpath = - [mac_util::MainAppBundle() pathForResource:@"SearchEngineDialog" + [base::mac::MainAppBundle() pathForResource:@"SearchEngineDialog" ofType:@"nib"]; self = [super initWithWindowNibPath:nibpath owner:self]; if (self != nil) { diff --git a/chrome/browser/ui/cocoa/shell_dialogs_mac.mm b/chrome/browser/ui/cocoa/shell_dialogs_mac.mm index 2148539..24b1bc9 100644 --- a/chrome/browser/ui/cocoa/shell_dialogs_mac.mm +++ b/chrome/browser/ui/cocoa/shell_dialogs_mac.mm @@ -15,7 +15,7 @@ #include "base/file_util.h" #include "base/logging.h" #import "base/mac/cocoa_protocols.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #import "base/scoped_nsobject.h" #include "base/sys_string_conversions.h" @@ -289,7 +289,7 @@ NSView* SelectFileDialogImpl::GetAccessoryView(const FileTypeInfo* file_types, DCHECK(file_types); scoped_nsobject<NSNib> nib ( [[NSNib alloc] initWithNibNamed:@"SaveAccessoryView" - bundle:mac_util::MainAppBundle()]); + bundle:base::mac::MainAppBundle()]); if (!nib) return nil; diff --git a/chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.mm b/chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.mm index 7beac9c..7b4c1f8 100644 --- a/chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.mm +++ b/chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.mm @@ -7,7 +7,7 @@ #include "app/l10n_util_mac.h" #include "app/table_model_observer.h" #include "base/logging.h" -#import "base/mac_util.h" +#import "base/mac/mac_util.h" #import "base/scoped_nsobject.h" #include "base/sys_string_conversions.h" #include "grit/generated_resources.h" @@ -36,7 +36,7 @@ SimpleContentExceptionsWindowController* g_exceptionWindow = nil; } - (id)initWithTableModel:(RemoveRowsTableModel*)model { - NSString* nibpath = [mac_util::MainAppBundle() + NSString* nibpath = [base::mac::MainAppBundle() pathForResource:@"SimpleContentExceptionsWindow" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibpath owner:self])) { diff --git a/chrome/browser/ui/cocoa/speech_input_window_controller.mm b/chrome/browser/ui/cocoa/speech_input_window_controller.mm index c490bc1..abb9128 100644 --- a/chrome/browser/ui/cocoa/speech_input_window_controller.mm +++ b/chrome/browser/ui/cocoa/speech_input_window_controller.mm @@ -7,9 +7,7 @@ #include "app/l10n_util_mac.h" #include "app/resource_bundle.h" #include "base/logging.h" -#include "base/mac_util.h" #include "base/sys_string_conversions.h" - #include "chrome/browser/ui/cocoa/info_bubble_view.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/cocoa/tab_contents_controller.mm b/chrome/browser/ui/cocoa/tab_contents_controller.mm index c7b5cf8..f710755 100644 --- a/chrome/browser/ui/cocoa/tab_contents_controller.mm +++ b/chrome/browser/ui/cocoa/tab_contents_controller.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/tab_contents_controller.h" -#include "base/mac_util.h" #include "base/scoped_nsobject.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" diff --git a/chrome/browser/ui/cocoa/tab_controller.mm b/chrome/browser/ui/cocoa/tab_controller.mm index 2ae2454..f05bb21 100644 --- a/chrome/browser/ui/cocoa/tab_controller.mm +++ b/chrome/browser/ui/cocoa/tab_controller.mm @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "app/l10n_util_mac.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #import "chrome/browser/themes/browser_theme_provider.h" #import "chrome/browser/ui/cocoa/menu_controller.h" #import "chrome/browser/ui/cocoa/tab_controller.h" @@ -73,7 +73,7 @@ class MenuDelegate : public menus::SimpleMenuModel::Delegate { } - (id)init { - self = [super initWithNibName:@"TabView" bundle:mac_util::MainAppBundle()]; + self = [super initWithNibName:@"TabView" bundle:base::mac::MainAppBundle()]; if (self != nil) { isIconShowing_ = YES; NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter]; diff --git a/chrome/browser/ui/cocoa/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tab_strip_controller.mm index 826910c..fa9f037 100644 --- a/chrome/browser/ui/cocoa/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tab_strip_controller.mm @@ -12,7 +12,6 @@ #include "app/l10n_util.h" #include "app/mac/nsimage_cache.h" #include "app/resource_bundle.h" -#include "base/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/autocomplete.h" diff --git a/chrome/browser/ui/cocoa/tab_strip_view.mm b/chrome/browser/ui/cocoa/tab_strip_view.mm index 2456362..857da65 100644 --- a/chrome/browser/ui/cocoa/tab_strip_view.mm +++ b/chrome/browser/ui/cocoa/tab_strip_view.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/tab_strip_view.h" #include "base/logging.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "chrome/browser/themes/browser_theme_provider.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/tab_strip_controller.h" @@ -156,7 +156,7 @@ // "short" as 0.8 seconds. (Measuring up-to-up isn't enough to properly // detect double-clicks, but we're actually using Cocoa for that.) if (clickCount == 2 && (timestamp - lastMouseUp_) < 0.8) { - if (mac_util::ShouldWindowsMiniaturizeOnDoubleClick()) + if (base::mac::ShouldWindowsMiniaturizeOnDoubleClick()) [[self window] performMiniaturize:self]; } else { [super mouseUp:event]; diff --git a/chrome/browser/ui/cocoa/tab_view.mm b/chrome/browser/ui/cocoa/tab_view.mm index 128b83f..0a655ad 100644 --- a/chrome/browser/ui/cocoa/tab_view.mm +++ b/chrome/browser/ui/cocoa/tab_view.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/tab_view.h" #include "base/logging.h" -#import "base/mac_util.h" +#import "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "chrome/browser/accessibility/browser_accessibility_state.h" #include "chrome/browser/themes/browser_theme_provider.h" @@ -988,14 +988,14 @@ const CGFloat kRapidCloseDist = 2.5; DCHECK(CFGetTypeID(dict) == CFDictionaryGetTypeID()); // Sanity check the ID. - CFNumberRef otherIDRef = (CFNumberRef)mac_util::GetValueFromDictionary( + CFNumberRef otherIDRef = (CFNumberRef)base::mac::GetValueFromDictionary( dict, kCGWindowNumber, CFNumberGetTypeID()); CGWindowID otherID; if (otherIDRef && CFNumberGetValue(otherIDRef, kCGWindowIDCFNumberType, &otherID) && otherID == windowID) { // And then get the workspace. - CFNumberRef workspaceRef = (CFNumberRef)mac_util::GetValueFromDictionary( + CFNumberRef workspaceRef = (CFNumberRef)base::mac::GetValueFromDictionary( dict, kCGWindowWorkspace, CFNumberGetTypeID()); if (!workspaceRef || !CFNumberGetValue(workspaceRef, kCFNumberIntType, &workspace)) { diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm index 7f96f59..b9e4a3d 100644 --- a/chrome/browser/ui/cocoa/tabpose_window.mm +++ b/chrome/browser/ui/cocoa/tabpose_window.mm @@ -7,7 +7,7 @@ #import <QuartzCore/QuartzCore.h> #include "app/resource_bundle.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/scoped_callback_factory.h" #include "base/sys_string_conversions.h" @@ -1020,7 +1020,7 @@ void AnimateCALayerOpacityFromTo( nsFavicon = defaultFavIcon; } base::mac::ScopedCFTypeRef<CGImageRef> favicon( - mac_util::CopyNSImageToCGImage(nsFavicon)); + base::mac::CopyNSImageToCGImage(nsFavicon)); CALayer* faviconLayer = [CALayer layer]; if (showZoom) { diff --git a/chrome/browser/ui/cocoa/task_manager_mac.mm b/chrome/browser/ui/cocoa/task_manager_mac.mm index c11564c..28cbba0 100644 --- a/chrome/browser/ui/cocoa/task_manager_mac.mm +++ b/chrome/browser/ui/cocoa/task_manager_mac.mm @@ -8,7 +8,7 @@ #include <vector> #include "app/l10n_util_mac.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/browser_process.h" #import "chrome/browser/ui/cocoa/window_size_autosaver.h" @@ -103,7 +103,7 @@ class SortHelper { @implementation TaskManagerWindowController - (id)initWithTaskManagerObserver:(TaskManagerMac*)taskManagerObserver { - NSString* nibpath = [mac_util::MainAppBundle() + NSString* nibpath = [base::mac::MainAppBundle() pathForResource:@"TaskManager" ofType:@"nib"]; if ((self = [super initWithWindowNibPath:nibpath owner:self])) { diff --git a/chrome/browser/ui/cocoa/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar_controller.mm index 1b953fd..22d3dde 100644 --- a/chrome/browser/ui/cocoa/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar_controller.mm @@ -12,7 +12,7 @@ #include "app/menus/accelerator_cocoa.h" #include "app/menus/menu_model.h" #include "app/resource_bundle.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/singleton.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -170,7 +170,7 @@ class NotificationBridge : public NotificationObserver { nibFileNamed:(NSString*)nibName { DCHECK(model && commands && profile && [nibName length]); if ((self = [super initWithNibName:nibName - bundle:mac_util::MainAppBundle()])) { + bundle:base::mac::MainAppBundle()])) { toolbarModel_ = model; commands_ = commands; profile_ = profile; diff --git a/chrome/browser/ui/cocoa/translate/translate_infobar_base.mm b/chrome/browser/ui/cocoa/translate/translate_infobar_base.mm index 4a08895..a91cd11 100644 --- a/chrome/browser/ui/cocoa/translate/translate_infobar_base.mm +++ b/chrome/browser/ui/cocoa/translate/translate_infobar_base.mm @@ -7,7 +7,6 @@ #include "app/l10n_util.h" #include "base/logging.h" -#include "base/mac_util.h" #include "base/metrics/histogram.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" |