chrome/browser/ui/cocoa/content_exceptions_window_controller.mm - Issue 6046009: Move base/mac_util.h to base/mac and use the base::mac namespace....

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/content_exceptions_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:

Index: chrome/browser/ui/cocoa/content_exceptions_window_controller.mm

===================================================================

--- chrome/browser/ui/cocoa/content_exceptions_window_controller.mm (revision 70358)

+++ chrome/browser/ui/cocoa/content_exceptions_window_controller.mm (working copy)

@@ -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 @@

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;