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

Unified Diff: base/mac/launch_services_util.mm

Issue 2390953003: [Mac Fix-It] Changed OpenApplicationWithPath to use NSWorkspace. (Closed)
Patch Set: Addressed review comments Created 4 years, 2 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
« no previous file with comments | « base/mac/launch_services_util.cc ('k') | chrome/app_shim/app_mode_loader_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/mac/launch_services_util.mm
diff --git a/base/mac/launch_services_util.mm b/base/mac/launch_services_util.mm
new file mode 100644
index 0000000000000000000000000000000000000000..fa6e8087e68e14e792a57ca533944edd33cb6d0e
--- /dev/null
+++ b/base/mac/launch_services_util.mm
@@ -0,0 +1,52 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import "base/mac/launch_services_util.h"
+
+#include "base/logging.h"
+#include "base/strings/sys_string_conversions.h"
+
+namespace base {
+namespace mac {
+
+Process OpenApplicationWithPath(const base::FilePath& bundle_path,
+ const CommandLine& command_line,
+ NSWorkspaceLaunchOptions launch_options) {
+ NSString* bundle_url_spec = base::SysUTF8ToNSString(bundle_path.value());
+ NSURL* bundle_url = [NSURL fileURLWithPath:bundle_url_spec isDirectory:YES];
+ DCHECK(bundle_url);
+ if (!bundle_url) {
+ return Process();
+ }
+
+ // NSWorkspace automatically adds the binary path as the first argument and
+ // it should not be included into the list.
+ std::vector<std::string> argv = command_line.argv();
+ int argc = argv.size();
+ NSMutableArray* launch_args = [NSMutableArray arrayWithCapacity:argc - 1];
+ for (int i = 1; i < argc; ++i) {
+ [launch_args addObject:base::SysUTF8ToNSString(argv[i])];
+ }
+
+ NSDictionary* configuration = @{
+ NSWorkspaceLaunchConfigurationArguments : launch_args,
+ };
+ NSError* launch_error = nil;
+ // TODO(jeremya): this opens a new browser window if Chrome is already
+ // running without any windows open.
+ NSRunningApplication* app =
+ [[NSWorkspace sharedWorkspace] launchApplicationAtURL:bundle_url
+ options:launch_options
+ configuration:configuration
+ error:&launch_error];
+ if (launch_error) {
+ LOG(ERROR) << base::SysNSStringToUTF8([launch_error localizedDescription]);
+ return Process();
+ }
+ DCHECK(app);
+ return Process([app processIdentifier]);
+}
+
+} // namespace mac
+} // namespace base
« no previous file with comments | « base/mac/launch_services_util.cc ('k') | chrome/app_shim/app_mode_loader_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698