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

Side by Side Diff: sandbox/mac/os_compatibility.cc

Issue 1224283006: Update OS version functions for OS X 10.11 El Capitan. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "sandbox/mac/os_compatibility.h" 5 #include "sandbox/mac/os_compatibility.h"
6 6
7 #include <servers/bootstrap.h> 7 #include <servers/bootstrap.h>
8 #include <unistd.h> 8 #include <unistd.h>
9 9
10 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 .msg_id_swap_integer = 416, 113 .msg_id_swap_integer = 416,
114 .look_up2_fill_reply = &LaunchdLookUp2FillReply<look_up2_reply_10_6>, 114 .look_up2_fill_reply = &LaunchdLookUp2FillReply<look_up2_reply_10_6>,
115 .swap_integer_is_get_only = 115 .swap_integer_is_get_only =
116 &LaunchdSwapIntegerIsGetOnly<swap_integer_request_10_6>, 116 &LaunchdSwapIntegerIsGetOnly<swap_integer_request_10_6>,
117 }; 117 };
118 118
119 if (base::mac::IsOSSnowLeopard()) { 119 if (base::mac::IsOSSnowLeopard()) {
120 shim.look_up2_get_request_name = 120 shim.look_up2_get_request_name =
121 &LaunchdLookUp2GetRequestName<look_up2_request_10_6>; 121 &LaunchdLookUp2GetRequestName<look_up2_request_10_6>;
122 } else if (base::mac::IsOSLionOrLater() && 122 } else if (base::mac::IsOSLionOrLater() &&
123 !base::mac::IsOSYosemiteOrLater()) { 123 !base::mac::IsOSLaterThanElCapitan_DontCallThis()) {
Andre 2015/07/15 21:33:32 I'm not sure about this. !IsOSYosemiteOrLater does
Robert Sesek 2015/07/15 21:44:45 This is checking for >= 10.7 && < 10.10.
Andre 2015/07/15 21:49:17 But why? Do we expect Yosemite and El Capitan to l
Robert Sesek 2015/07/15 21:50:26 This component needs to be updated for 10.10+ so i
Andre 2015/07/15 21:53:47 Got it. Fixed in patchset #2.
124 shim.look_up2_get_request_name = 124 shim.look_up2_get_request_name =
125 &LaunchdLookUp2GetRequestName<look_up2_request_10_7>; 125 &LaunchdLookUp2GetRequestName<look_up2_request_10_7>;
126 } else { 126 } else {
127 DLOG(ERROR) << "Unknown OS, using launchd compatibility shim from 10.7."; 127 DLOG(ERROR) << "Unknown OS, using launchd compatibility shim from 10.7.";
128 shim.look_up2_get_request_name = 128 shim.look_up2_get_request_name =
129 &LaunchdLookUp2GetRequestName<look_up2_request_10_7>; 129 &LaunchdLookUp2GetRequestName<look_up2_request_10_7>;
130 } 130 }
131 131
132 return shim; 132 return shim;
133 } 133 }
134 134
135 } // namespace sandbox 135 } // namespace sandbox
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698