diff options
| author | jeremya@chromium.org <jeremya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 06:24:32 +0000 |
|---|---|---|
| committer | jeremya@chromium.org <jeremya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 06:24:32 +0000 |
| commit | ccfab591456e8c231a784823edcd560267bcb382 (patch) | |
| tree | 7f083d4ba68a22f7b946d918c3cd2a97c4c5846e /chrome/app/app_mode_loader_mac.mm | |
| parent | 289f05cc53e22a3073ffe1abc14d50f5bc258014 (diff) | |
| download | chromium_src-ccfab591456e8c231a784823edcd560267bcb382.zip chromium_src-ccfab591456e8c231a784823edcd560267bcb382.tar.gz chromium_src-ccfab591456e8c231a784823edcd560267bcb382.tar.bz2 | |
Rearchitecting the 'app mode' code on mac for v2 apps.
A lot of the old code assumed an outdated model for v2 packaged apps on mac;
specifically that they used to run in their own Chrome process with their own
user data directory. This is no longer the case, and as such it's not possible
to have apps running in their own process, because they need access to profile
information from Chrome.
This patch changes the code so that the 'app mode' .app bundles function more
like shortcuts to open the app in an existing Chrome browser process (launching
Chrome if it's not already running). This allows the app to be launched via
Spotlight and the /Applications folder, and the user can e.g. drag the app onto
the dock like a regular Mac application.
There is as yet no way to trigger the shortcut creation code.
BUG=168080
Review URL: https://chromiumcodereview.appspot.com/11737014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176803 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/app_mode_loader_mac.mm')
| -rw-r--r-- | chrome/app/app_mode_loader_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/app/app_mode_loader_mac.mm b/chrome/app/app_mode_loader_mac.mm index e8242f0..208d3cf 100644 --- a/chrome/app/app_mode_loader_mac.mm +++ b/chrome/app/app_mode_loader_mac.mm @@ -95,8 +95,8 @@ void LoadFramework(void** cr_dylib, app_mode::ChromeAppModeInfo* info) { info->user_data_dir = base::mac::NSStringToFilePath( [info_plist objectForKey:app_mode::kCrAppModeUserDataDirKey]); - info->extension_path = base::mac::NSStringToFilePath( - [info_plist objectForKey:app_mode::kCrAppModeExtensionPathKey]); + info->profile_dir = base::mac::NSStringToFilePath( + [info_plist objectForKey:app_mode::kCrAppModeProfileDirKey]); // Open the framework. *cr_dylib = dlopen(framework_shlib_path.value().c_str(), RTLD_LAZY); |