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

Unified Diff: chrome/browser/mac/install_from_dmg.mm

Issue 9240004: Transition to base/mac/bundle_locations.h step 3 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 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
Index: chrome/browser/mac/install_from_dmg.mm
diff --git a/chrome/browser/mac/install_from_dmg.mm b/chrome/browser/mac/install_from_dmg.mm
index 6f276b8e9febda082a29e0fe032686045572554d..1e753249c37a200db99e3ba8ce581d90b6fea4eb 100644
--- a/chrome/browser/mac/install_from_dmg.mm
+++ b/chrome/browser/mac/install_from_dmg.mm
@@ -21,6 +21,7 @@
#include "base/command_line.h"
#include "base/file_path.h"
#include "base/logging.h"
+#include "base/mac/bundle_locations.h"
#import "base/mac/mac_util.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/mac/scoped_nsautorelease_pool.h"
@@ -234,7 +235,7 @@ bool IsPathOnReadOnlyDiskImage(const char path[],
// the disk image's device, in "diskNsM" form.
bool IsAppRunningFromReadOnlyDiskImage(std::string* dmg_bsd_device_name) {
return IsPathOnReadOnlyDiskImage(
- [[[NSBundle mainBundle] bundlePath] fileSystemRepresentation],
+ [[base::mac::OuterBundle() bundlePath] fileSystemRepresentation],
dmg_bsd_device_name);
}
@@ -424,7 +425,7 @@ bool MaybeInstallFromDiskImage() {
return false;
}
- NSString* source_path = [[NSBundle mainBundle] bundlePath];
+ NSString* source_path = [base::mac::OuterBundle() bundlePath];
NSString* application_name = [source_path lastPathComponent];
NSString* target_path =
[application_directory stringByAppendingPathComponent:application_name];

Powered by Google App Engine
This is Rietveld 408576698