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

Side by Side Diff: chrome/common/channel_info_mac.mm

Issue 1548153002: Switch to standard integer types in chrome/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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/common/channel_info.h ('k') | chrome/common/child_process_logging.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) 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 #include "chrome/common/channel_info.h" 5 #include "chrome/common/channel_info.h"
6 6
7 #import <Foundation/Foundation.h> 7 #import <Foundation/Foundation.h>
8 8
9 #include "base/basictypes.h"
10 #include "base/mac/bundle_locations.h" 9 #include "base/mac/bundle_locations.h"
11 #include "base/strings/sys_string_conversions.h" 10 #include "base/strings/sys_string_conversions.h"
12 #include "components/version_info/version_info.h" 11 #include "components/version_info/version_info.h"
13 12
14 namespace chrome { 13 namespace chrome {
15 14
16 std::string GetChannelString() { 15 std::string GetChannelString() {
17 #if defined(GOOGLE_CHROME_BUILD) 16 #if defined(GOOGLE_CHROME_BUILD)
18 // Use the main Chrome application bundle and not the framework bundle. 17 // Use the main Chrome application bundle and not the framework bundle.
19 // Keystone keys don't live in the framework. 18 // Keystone keys don't live in the framework.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 return version_info::Channel::DEV; 52 return version_info::Channel::DEV;
54 } else if (channel == "canary") { 53 } else if (channel == "canary") {
55 return version_info::Channel::CANARY; 54 return version_info::Channel::CANARY;
56 } 55 }
57 #endif 56 #endif
58 57
59 return version_info::Channel::UNKNOWN; 58 return version_info::Channel::UNKNOWN;
60 } 59 }
61 60
62 } // namespace chrome 61 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/channel_info.h ('k') | chrome/common/child_process_logging.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698