From 0378bf4edc40686bac06c8e14bd25fdb3f9cfb28 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Sat, 1 Jan 2011 18:20:14 +0000 Subject: Move base/mac_util.h to base/mac and use the base::mac namespace. Fix up callers to use the new location & namespace. Remove includes from  files where it wasn't necessary. TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/6046009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70359 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/common/chrome_paths.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'chrome/common/chrome_paths.cc') diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index 1b8e612..344db91 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -15,7 +15,7 @@ #include "chrome/common/chrome_switches.h" #if defined(OS_MACOSX) -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #endif namespace { @@ -39,7 +39,7 @@ bool GetInternalPluginsDirectory(FilePath* result) { #if defined(OS_MACOSX) // If called from Chrome, get internal plugins from a subdirectory of the // framework. - if (mac_util::AmIBundled()) { + if (base::mac::AmIBundled()) { *result = chrome::GetFrameworkBundlePath(); DCHECK(!result->empty()); *result = result->Append("Internet Plug-Ins"); @@ -79,7 +79,7 @@ bool PathProvider(int key, FilePath* result) { #if defined(OS_MACOSX) if (!PathService::Get(base::DIR_EXE, result)) return false; - if (mac_util::AmIBundled()) { + if (base::mac::AmIBundled()) { // If we're called from chrome, dump it beside the app (outside the // app bundle), if we're called from a unittest, we'll already // outside the bundle so use the exe dir. @@ -145,7 +145,7 @@ bool PathProvider(int key, FilePath* result) { break; case chrome::DIR_RESOURCES: #if defined(OS_MACOSX) - cur = mac_util::MainAppBundlePath(); + cur = base::mac::MainAppBundlePath(); cur = cur.Append(FILE_PATH_LITERAL("Resources")); #else if (!PathService::Get(chrome::DIR_APP, &cur)) @@ -253,8 +253,8 @@ bool PathProvider(int key, FilePath* result) { break; case chrome::FILE_RESOURCES_PACK: #if defined(OS_MACOSX) - if (mac_util::AmIBundled()) { - cur = mac_util::MainAppBundlePath(); + if (base::mac::AmIBundled()) { + cur = base::mac::MainAppBundlePath(); cur = cur.Append(FILE_PATH_LITERAL("Resources")) .Append(FILE_PATH_LITERAL("resources.pak")); break; -- cgit v1.1