Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3746)

Unified Diff: chrome/browser/ui/cocoa/preferences_window_controller.mm

Issue 6046009: Move base/mac_util.h to base/mac and use the base::mac namespace.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/preferences_window_controller.mm
===================================================================
--- chrome/browser/ui/cocoa/preferences_window_controller.mm (revision 70358)
+++ chrome/browser/ui/cocoa/preferences_window_controller.mm (working copy)
@@ -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 @@
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 @@
verticalShift += AutoSizeGroup(basicsGroupDefaultBrowser_,
kAutoSizeGroupBehaviorVerticalFirstToFit,
verticalShift);
- verticalShift += AutoSizeGroup(basicsGroupSearchEngine_,
- kAutoSizeGroupBehaviorFirstTwoAsRowVerticalToFit,
- verticalShift);
+ verticalShift += AutoSizeGroup(
+ basicsGroupSearchEngine_,
+ kAutoSizeGroupBehaviorFirstTwoAsRowVerticalToFit,
+ verticalShift);
verticalShift += AutoSizeGroup(basicsGroupToolbar_,
kAutoSizeGroupBehaviorVerticalToFit,
verticalShift);
« no previous file with comments | « chrome/browser/ui/cocoa/nsimage_cache_unittest.mm ('k') | chrome/browser/ui/cocoa/previewable_contents_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698