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

Unified Diff: chrome/browser/ui/cocoa/about_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
« no previous file with comments | « chrome/browser/ui/cocoa/about_ipc_controller.mm ('k') | chrome/browser/ui/cocoa/animatable_image.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/about_window_controller.mm
===================================================================
--- chrome/browser/ui/cocoa/about_window_controller.mm (revision 70358)
+++ chrome/browser/ui/cocoa/about_window_controller.mm (working copy)
@@ -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 @@
@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 @@
static BOOL recentShownUserActionFailedStatus = NO;
- (void)awakeFromNib {
- NSBundle* bundle = mac_util::MainAppBundle();
+ NSBundle* bundle = base::mac::MainAppBundle();
NSString* chromeVersion =
[bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
« no previous file with comments | « chrome/browser/ui/cocoa/about_ipc_controller.mm ('k') | chrome/browser/ui/cocoa/animatable_image.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698