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

Unified Diff: chrome/browser/ui/cocoa/cocoa_test_helper.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/cocoa_test_helper.h ('k') | chrome/browser/ui/cocoa/collected_cookies_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/cocoa_test_helper.mm
===================================================================
--- chrome/browser/ui/cocoa/cocoa_test_helper.mm (revision 70358)
+++ chrome/browser/ui/cocoa/cocoa_test_helper.mm (working copy)
@@ -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 @@
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 @@
(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.
{
« no previous file with comments | « chrome/browser/ui/cocoa/cocoa_test_helper.h ('k') | chrome/browser/ui/cocoa/collected_cookies_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698