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

Side by Side Diff: base/mac/launch_services_util.cc

Issue 20037002: Fix app shim focus. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 | « base/mac/launch_services_util.h ('k') | chrome/browser/web_applications/web_app_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "base/mac/launch_services_util.h" 5 #include "base/mac/launch_services_util.h"
6 6
7 #include <ApplicationServices/ApplicationServices.h> 7 #include <ApplicationServices/ApplicationServices.h>
tapted 2013/07/23 11:08:28 nit: this include is redundant now
jackhou1 2013/07/23 12:13:16 Done.
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/mac/mac_logging.h" 10 #include "base/mac/mac_logging.h"
11 #include "base/mac/mac_util.h" 11 #include "base/mac/mac_util.h"
12 #include "base/strings/sys_string_conversions.h" 12 #include "base/strings/sys_string_conversions.h"
13 13
14 namespace base { 14 namespace base {
15 namespace mac { 15 namespace mac {
16 16
17 bool OpenApplicationWithPath(const base::FilePath& bundle_path, 17 bool OpenApplicationWithPath(const base::FilePath& bundle_path,
18 const CommandLine& command_line, 18 const CommandLine& command_line,
19 LSLaunchFlags launch_flags,
19 ProcessSerialNumber* out_psn) { 20 ProcessSerialNumber* out_psn) {
20 FSRef app_fsref; 21 FSRef app_fsref;
21 if (!base::mac::FSRefFromPath(bundle_path.value(), &app_fsref)) { 22 if (!base::mac::FSRefFromPath(bundle_path.value(), &app_fsref)) {
22 LOG(ERROR) << "base::mac::FSRefFromPath failed for " << bundle_path.value(); 23 LOG(ERROR) << "base::mac::FSRefFromPath failed for " << bundle_path.value();
23 return false; 24 return false;
24 } 25 }
25 26
26 std::vector<std::string> argv = command_line.argv(); 27 std::vector<std::string> argv = command_line.argv();
27 int argc = argv.size(); 28 int argc = argv.size();
28 base::ScopedCFTypeRef<CFMutableArrayRef> launch_args( 29 base::ScopedCFTypeRef<CFMutableArrayRef> launch_args(
29 CFArrayCreateMutable(NULL, argc - 1, &kCFTypeArrayCallBacks)); 30 CFArrayCreateMutable(NULL, argc - 1, &kCFTypeArrayCallBacks));
30 if (!launch_args) { 31 if (!launch_args) {
31 LOG(ERROR) << "CFArrayCreateMutable failed, size was " << argc; 32 LOG(ERROR) << "CFArrayCreateMutable failed, size was " << argc;
32 return false; 33 return false;
33 } 34 }
34 35
35 for (int i = 1; i < argc; ++i) { 36 for (int i = 1; i < argc; ++i) {
36 const std::string& arg(argv[i]); 37 const std::string& arg(argv[i]);
37 38
38 base::ScopedCFTypeRef<CFStringRef> arg_cf(base::SysUTF8ToCFStringRef(arg)); 39 base::ScopedCFTypeRef<CFStringRef> arg_cf(base::SysUTF8ToCFStringRef(arg));
39 if (!arg_cf) { 40 if (!arg_cf) {
40 LOG(ERROR) << "base::SysUTF8ToCFStringRef failed for " << arg; 41 LOG(ERROR) << "base::SysUTF8ToCFStringRef failed for " << arg;
41 return false; 42 return false;
42 } 43 }
43 CFArrayAppendValue(launch_args, arg_cf); 44 CFArrayAppendValue(launch_args, arg_cf);
44 } 45 }
45 46
46 LSApplicationParameters ls_parameters = { 47 LSApplicationParameters ls_parameters = {
47 0, // version 48 0, // version
48 kLSLaunchDefaults, 49 launch_flags,
49 &app_fsref, 50 &app_fsref,
50 NULL, // asyncLaunchRefCon 51 NULL, // asyncLaunchRefCon
51 NULL, // environment 52 NULL, // environment
52 launch_args, 53 launch_args,
53 NULL // initialEvent 54 NULL // initialEvent
54 }; 55 };
55 // TODO(jeremya): this opens a new browser window if Chrome is already 56 // TODO(jeremya): this opens a new browser window if Chrome is already
56 // running without any windows open. 57 // running without any windows open.
57 OSStatus status = LSOpenApplication(&ls_parameters, out_psn); 58 OSStatus status = LSOpenApplication(&ls_parameters, out_psn);
58 if (status != noErr) { 59 if (status != noErr) {
59 OSSTATUS_LOG(ERROR, status) << "LSOpenApplication"; 60 OSSTATUS_LOG(ERROR, status) << "LSOpenApplication";
60 return false; 61 return false;
61 } 62 }
62 return true; 63 return true;
63 } 64 }
64 65
65 } // namespace mac 66 } // namespace mac
66 } // namespace base 67 } // namespace base
OLDNEW
« no previous file with comments | « base/mac/launch_services_util.h ('k') | chrome/browser/web_applications/web_app_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698