| Index: chrome/browser/web_applications/web_app_mac.mm
|
| diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm
|
| index ce6f20830d530724f181881b1cb056f6d36df75f..5224191b4db40a0f9bae91bb5a6cd73d09d1f792 100644
|
| --- a/chrome/browser/web_applications/web_app_mac.mm
|
| +++ b/chrome/browser/web_applications/web_app_mac.mm
|
| @@ -258,7 +258,7 @@ namespace web_app {
|
|
|
| namespace internals {
|
|
|
| -FilePath GetAppBundleByExtensionId(std::string extension_id) {
|
| +base::FilePath GetAppBundleByExtensionId(std::string extension_id) {
|
| DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
|
| // This matches APP_MODE_APP_BUNDLE_ID in chrome/chrome.gyp.
|
| std::string bundle_id =
|
| @@ -271,10 +271,10 @@ FilePath GetAppBundleByExtensionId(std::string extension_id) {
|
| base::mac::ScopedCFTypeRef<CFURLRef> url(url_ref);
|
|
|
| if (status != noErr)
|
| - return FilePath();
|
| + return base::FilePath();
|
|
|
| NSString* path_string = [base::mac::CFToNSCast(url.get()) path];
|
| - return FilePath([path_string fileSystemRepresentation]);
|
| + return base::FilePath([path_string fileSystemRepresentation]);
|
| }
|
|
|
| bool CreatePlatformShortcuts(
|
| @@ -292,7 +292,7 @@ void DeletePlatformShortcuts(
|
| const ShellIntegration::ShortcutInfo& info) {
|
| DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
|
|
|
| - FilePath bundle_path = GetAppBundleByExtensionId(info.extension_id);
|
| + base::FilePath bundle_path = GetAppBundleByExtensionId(info.extension_id);
|
| file_util::Delete(bundle_path, true);
|
| }
|
|
|
|
|