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

Side by Side Diff: chrome/app/app_mode_loader_mac.mm

Issue 9374009: Install platform apps into a separate data directory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address review comments Created 8 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/app/chrome_main_app_mode_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // On Mac, shortcuts can't have command-line arguments. Instead, produce small 5 // On Mac, shortcuts can't have command-line arguments. Instead, produce small
6 // app bundles which locate the Chromium framework and load it, passing the 6 // app bundles which locate the Chromium framework and load it, passing the
7 // appropriate data. This is the code for such an app bundle. It should be kept 7 // appropriate data. This is the code for such an app bundle. It should be kept
8 // minimal and do as little work as possible (with as much work done on 8 // minimal and do as little work as possible (with as much work done on
9 // framework side as possible). 9 // framework side as possible).
10 10
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 info->app_mode_name = SysNSStringToUTF16( 91 info->app_mode_name = SysNSStringToUTF16(
92 [info_plist objectForKey:app_mode::kCrAppModeShortcutNameKey]); 92 [info_plist objectForKey:app_mode::kCrAppModeShortcutNameKey]);
93 93
94 info->app_mode_url = SysNSStringToUTF8( 94 info->app_mode_url = SysNSStringToUTF8(
95 [info_plist objectForKey:app_mode::kCrAppModeShortcutURLKey]); 95 [info_plist objectForKey:app_mode::kCrAppModeShortcutURLKey]);
96 CHECK(info->app_mode_url.size()) << "couldn't get app shortcut URL"; 96 CHECK(info->app_mode_url.size()) << "couldn't get app shortcut URL";
97 97
98 info->user_data_dir = base::mac::NSStringToFilePath( 98 info->user_data_dir = base::mac::NSStringToFilePath(
99 [info_plist objectForKey:app_mode::kCrAppModeUserDataDirKey]); 99 [info_plist objectForKey:app_mode::kCrAppModeUserDataDirKey]);
100 100
101 info->extension_path = base::mac::NSStringToFilePath(
102 [info_plist objectForKey:app_mode::kCrAppModeExtensionPathKey]);
103
101 // Open the framework. 104 // Open the framework.
102 *cr_dylib = dlopen(framework_shlib_path.value().c_str(), RTLD_LAZY); 105 *cr_dylib = dlopen(framework_shlib_path.value().c_str(), RTLD_LAZY);
103 CHECK(cr_dylib) << "couldn't load framework: " << dlerror(); 106 CHECK(cr_dylib) << "couldn't load framework: " << dlerror();
104 } 107 }
105 108
106 } // namespace 109 } // namespace
107 110
108 __attribute__((visibility("default"))) 111 __attribute__((visibility("default")))
109 int main(int argc, char** argv) { 112 int main(int argc, char** argv) {
110 app_mode::ChromeAppModeInfo info; 113 app_mode::ChromeAppModeInfo info;
(...skipping 10 matching lines...) Expand all
121 124
122 typedef int (*StartFun)(const app_mode::ChromeAppModeInfo*); 125 typedef int (*StartFun)(const app_mode::ChromeAppModeInfo*);
123 StartFun ChromeAppModeStart = (StartFun)dlsym(cr_dylib, "ChromeAppModeStart"); 126 StartFun ChromeAppModeStart = (StartFun)dlsym(cr_dylib, "ChromeAppModeStart");
124 CHECK(ChromeAppModeStart) << "couldn't get entry point"; 127 CHECK(ChromeAppModeStart) << "couldn't get entry point";
125 128
126 // Exit instead of returning to avoid the the removal of |main()| from stack 129 // Exit instead of returning to avoid the the removal of |main()| from stack
127 // backtraces under tail call optimization. 130 // backtraces under tail call optimization.
128 int rv = ChromeAppModeStart(&info); 131 int rv = ChromeAppModeStart(&info);
129 exit(rv); 132 exit(rv);
130 } 133 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/chrome_main_app_mode_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698