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

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

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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 | « chrome/browser/mac/install_from_dmg.mm ('k') | chrome/browser/mac/obsolete_system.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/mac/keystone_glue.h" 5 #import "chrome/browser/mac/keystone_glue.h"
6 6
7 #include <sys/mount.h> 7 #include <sys/mount.h>
8 #include <sys/param.h> 8 #include <sys/param.h>
9 #include <sys/stat.h> 9 #include <sys/stat.h>
10 10
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/location.h" 14 #include "base/location.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "base/mac/authorization_util.h" 16 #include "base/mac/authorization_util.h"
17 #include "base/mac/bundle_locations.h" 17 #include "base/mac/bundle_locations.h"
18 #include "base/mac/mac_logging.h" 18 #include "base/mac/mac_logging.h"
19 #include "base/mac/mac_util.h" 19 #include "base/mac/mac_util.h"
20 #include "base/mac/scoped_nsautorelease_pool.h" 20 #include "base/mac/scoped_nsautorelease_pool.h"
21 #include "base/mac/scoped_nsexception_enabler.h" 21 #include "base/mac/scoped_nsexception_enabler.h"
22 #include "base/memory/ref_counted.h" 22 #include "base/memory/ref_counted.h"
23 #include "base/strings/sys_string_conversions.h" 23 #include "base/strings/sys_string_conversions.h"
24 #include "base/threading/worker_pool.h" 24 #include "base/threading/worker_pool.h"
25 #include "build/build_config.h" 25 #include "build/build_config.h"
26 #import "chrome/browser/mac/keystone_registration.h" 26 #import "chrome/browser/mac/keystone_registration.h"
27 #include "chrome/browser/mac/obsolete_system.h" 27 #include "chrome/browser/mac/obsolete_system.h"
28 #include "chrome/common/chrome_constants.h" 28 #include "chrome/common/chrome_constants.h"
29 #include "chrome/common/chrome_version_info.h" 29 #include "chrome/common/chrome_version_info.h"
30 #include "grit/chromium_strings.h" 30 #include "chrome/grit/chromium_strings.h"
31 #include "grit/generated_resources.h" 31 #include "chrome/grit/generated_resources.h"
32 #include "ui/base/l10n/l10n_util.h" 32 #include "ui/base/l10n/l10n_util.h"
33 #include "ui/base/l10n/l10n_util_mac.h" 33 #include "ui/base/l10n/l10n_util_mac.h"
34 34
35 namespace { 35 namespace {
36 36
37 namespace ksr = keystone_registration; 37 namespace ksr = keystone_registration;
38 38
39 // Constants for the brand file (uses an external file so it can survive 39 // Constants for the brand file (uses an external file so it can survive
40 // updates to Chrome.) 40 // updates to Chrome.)
41 41
(...skipping 1038 matching lines...) Expand 10 before | Expand all | Expand 10 after
1080 return [KeystoneGlue defaultKeystoneGlue] != nil; 1080 return [KeystoneGlue defaultKeystoneGlue] != nil;
1081 } 1081 }
1082 1082
1083 base::string16 CurrentlyInstalledVersion() { 1083 base::string16 CurrentlyInstalledVersion() {
1084 KeystoneGlue* keystoneGlue = [KeystoneGlue defaultKeystoneGlue]; 1084 KeystoneGlue* keystoneGlue = [KeystoneGlue defaultKeystoneGlue];
1085 NSString* version = [keystoneGlue currentlyInstalledVersion]; 1085 NSString* version = [keystoneGlue currentlyInstalledVersion];
1086 return base::SysNSStringToUTF16(version); 1086 return base::SysNSStringToUTF16(version);
1087 } 1087 }
1088 1088
1089 } // namespace keystone_glue 1089 } // namespace keystone_glue
OLDNEW
« no previous file with comments | « chrome/browser/mac/install_from_dmg.mm ('k') | chrome/browser/mac/obsolete_system.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698