summaryrefslogtreecommitdiffstats
path: root/chrome/common/mac
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-27 23:05:07 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-27 23:05:07 +0000
commit09c9bbdd2d1724ec2029c232f11ea550de85e3d4 (patch)
tree0ccc70d0bce1e2d3cf68fb38a4924bc233ff6921 /chrome/common/mac
parent75fdbc09fa3abfcb99e3825e76444a81aa96ad18 (diff)
downloadchromium_src-09c9bbdd2d1724ec2029c232f11ea550de85e3d4.zip
chromium_src-09c9bbdd2d1724ec2029c232f11ea550de85e3d4.tar.gz
chromium_src-09c9bbdd2d1724ec2029c232f11ea550de85e3d4.tar.bz2
roll gtm 459:516
This is to pick up r516, a clang warning fix. Most changes in the roll are iOS or test-related and shouldn't affect chrome. Interesting changes: r465 changed an API ( http://code.google.com/p/google-toolbox-for-mac/source/detail?r=465 ) r471-473: GTMUILocalizer change. BUG=115847 TEST=remoting_host builds with the 10.6 sdk. Review URL: https://chromiumcodereview.appspot.com/9479009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123819 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/mac')
-rw-r--r--chrome/common/mac/launchd.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/common/mac/launchd.mm b/chrome/common/mac/launchd.mm
index 5abaaa2..9bbdf6d 100644
--- a/chrome/common/mac/launchd.mm
+++ b/chrome/common/mac/launchd.mm
@@ -96,7 +96,7 @@ CFDictionaryRef Launchd::CopyJobDictionary(CFStringRef label) {
}
CFDictionaryRef Launchd::CopyDictionaryByCheckingIn(CFErrorRef* error) {
- return GTMSMJobCheckIn(error);
+ return GTMSMCopyJobCheckInDictionary(error);
}
bool Launchd::RemoveJob(CFStringRef label, CFErrorRef* error) {