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

Side by Side Diff: chrome/browser/cocoa/keystone_glue.mm

Issue 2762014: Mac: clang build (Closed)
Patch Set: more Created 10 years, 6 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
« no previous file with comments | « chrome/browser/cocoa/keystone_glue.h ('k') | chrome/browser/cocoa/location_bar_view_mac.h » ('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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #import "chrome/browser/cocoa/keystone_glue.h" 5 #import "chrome/browser/cocoa/keystone_glue.h"
6 6
7 #include <sys/param.h> 7 #include <sys/param.h>
8 #include <sys/mount.h> 8 #include <sys/mount.h>
9 9
10 #include <vector> 10 #include <vector>
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 // -changePermissionsForPromotionComplete is called on the main thread. 168 // -changePermissionsForPromotionComplete is called on the main thread.
169 - (void)changePermissionsForPromotionAsync; 169 - (void)changePermissionsForPromotionAsync;
170 - (void)changePermissionsForPromotionWithTool:(NSString*)toolPath; 170 - (void)changePermissionsForPromotionWithTool:(NSString*)toolPath;
171 - (void)changePermissionsForPromotionComplete; 171 - (void)changePermissionsForPromotionComplete;
172 172
173 // Returns the brand file path to use for Keystone. 173 // Returns the brand file path to use for Keystone.
174 - (NSString*)brandFilePath; 174 - (NSString*)brandFilePath;
175 175
176 @end // @interface KeystoneGlue(Private) 176 @end // @interface KeystoneGlue(Private)
177 177
178 const NSString* const kAutoupdateStatusNotification = 178 NSString* const kAutoupdateStatusNotification =
179 @"AutoupdateStatusNotification"; 179 @"AutoupdateStatusNotification";
180 const NSString* const kAutoupdateStatusStatus = @"status"; 180 NSString* const kAutoupdateStatusStatus = @"status";
181 const NSString* const kAutoupdateStatusVersion = @"version"; 181 NSString* const kAutoupdateStatusVersion = @"version";
182 182
183 namespace { 183 namespace {
184 184
185 const NSString* const kChannelKey = @"KSChannelID"; 185 NSString* const kChannelKey = @"KSChannelID";
186 const NSString* const kBrandKey = @"KSBrandID"; 186 NSString* const kBrandKey = @"KSBrandID";
187 187
188 } // namespace 188 } // namespace
189 189
190 @implementation KeystoneGlue 190 @implementation KeystoneGlue
191 191
192 + (id)defaultKeystoneGlue { 192 + (id)defaultKeystoneGlue {
193 static bool sTriedCreatingDefaultKeystoneGlue = false; 193 static bool sTriedCreatingDefaultKeystoneGlue = false;
194 // TODO(jrg): use base::SingletonObjC<KeystoneGlue> 194 // TODO(jrg): use base::SingletonObjC<KeystoneGlue>
195 static KeystoneGlue* sDefaultKeystoneGlue = nil; // leaked 195 static KeystoneGlue* sDefaultKeystoneGlue = nil; // leaked
196 196
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
890 } 890 }
891 891
892 - (void)setAppPath:(NSString*)appPath { 892 - (void)setAppPath:(NSString*)appPath {
893 if (appPath != appPath_) { 893 if (appPath != appPath_) {
894 [appPath_ release]; 894 [appPath_ release];
895 appPath_ = [appPath copy]; 895 appPath_ = [appPath copy];
896 } 896 }
897 } 897 }
898 898
899 @end // @implementation KeystoneGlue 899 @end // @implementation KeystoneGlue
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/keystone_glue.h ('k') | chrome/browser/cocoa/location_bar_view_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698