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

Side by Side Diff: chrome/browser/ui/cocoa/about_window_controller.mm

Issue 7249003: Move GetVersionStringModifier() and GetChannel() from platform_util_* to chrome_version_info_* (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: correct nits Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/cocoa/about_window_controller.h" 5 #import "chrome/browser/ui/cocoa/about_window_controller.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/mac/mac_util.h" 8 #include "base/mac/mac_util.h"
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
11 #include "base/sys_string_conversions.h" 11 #include "base/sys_string_conversions.h"
12 #include "chrome/browser/google/google_util.h" 12 #include "chrome/browser/google/google_util.h"
13 #import "chrome/browser/mac/keystone_glue.h" 13 #import "chrome/browser/mac/keystone_glue.h"
14 #include "chrome/browser/platform_util.h"
15 #include "chrome/browser/ui/browser_list.h" 14 #include "chrome/browser/ui/browser_list.h"
16 #include "chrome/browser/ui/browser_window.h" 15 #include "chrome/browser/ui/browser_window.h"
17 #import "chrome/browser/ui/cocoa/background_tile_view.h" 16 #import "chrome/browser/ui/cocoa/background_tile_view.h"
18 #include "chrome/browser/ui/cocoa/restart_browser.h" 17 #include "chrome/browser/ui/cocoa/restart_browser.h"
18 #include "chrome/common/chrome_version_info.h"
19 #include "chrome/common/url_constants.h" 19 #include "chrome/common/url_constants.h"
20 #include "grit/chromium_strings.h" 20 #include "grit/chromium_strings.h"
21 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
22 #include "grit/locale_settings.h" 22 #include "grit/locale_settings.h"
23 #include "grit/theme_resources.h" 23 #include "grit/theme_resources.h"
24 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" 24 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
25 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
26 #include "ui/base/l10n/l10n_util_mac.h" 26 #include "ui/base/l10n/l10n_util_mac.h"
27 #include "ui/base/resource/resource_bundle.h" 27 #include "ui/base/resource/resource_bundle.h"
28 #include "ui/gfx/image/image.h" 28 #include "ui/gfx/image/image.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 // maintained by -updateStatus:. 129 // maintained by -updateStatus:.
130 static BOOL recentShownUserActionFailedStatus = NO; 130 static BOOL recentShownUserActionFailedStatus = NO;
131 131
132 - (void)awakeFromNib { 132 - (void)awakeFromNib {
133 NSBundle* bundle = base::mac::MainAppBundle(); 133 NSBundle* bundle = base::mac::MainAppBundle();
134 NSString* chromeVersion = 134 NSString* chromeVersion =
135 [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"]; 135 [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
136 136
137 NSString* versionModifier = @""; 137 NSString* versionModifier = @"";
138 NSString* svnRevision = @""; 138 NSString* svnRevision = @"";
139 std::string modifier = platform_util::GetVersionStringModifier(); 139 std::string modifier = chrome::VersionInfo::GetVersionStringModifier();
140 if (!modifier.empty()) 140 if (!modifier.empty())
141 versionModifier = [NSString stringWithFormat:@" %@", 141 versionModifier = [NSString stringWithFormat:@" %@",
142 base::SysUTF8ToNSString(modifier)]; 142 base::SysUTF8ToNSString(modifier)];
143 143
144 #if !defined(GOOGLE_CHROME_BUILD) 144 #if !defined(GOOGLE_CHROME_BUILD)
145 svnRevision = [NSString stringWithFormat:@" (%@)", 145 svnRevision = [NSString stringWithFormat:@" (%@)",
146 [bundle objectForInfoDictionaryKey:@"SVNRevision"]]; 146 [bundle objectForInfoDictionaryKey:@"SVNRevision"]];
147 #endif 147 #endif
148 // The format string is not localized, but this is how the displayed version 148 // The format string is not localized, but this is how the displayed version
149 // is built on Windows too. 149 // is built on Windows too.
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 NSRange string_range = NSMakeRange(0, [legal_block length]); 756 NSRange string_range = NSMakeRange(0, [legal_block length]);
757 [legal_block addAttribute:NSFontAttributeName 757 [legal_block addAttribute:NSFontAttributeName
758 value:[NSFont labelFontOfSize:11] 758 value:[NSFont labelFontOfSize:11]
759 range:string_range]; 759 range:string_range];
760 760
761 [legal_block endEditing]; 761 [legal_block endEditing];
762 return legal_block; 762 return legal_block;
763 } 763 }
764 764
765 @end // @implementation AboutWindowController 765 @end // @implementation AboutWindowController
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | chrome/browser/ui/cocoa/first_run_dialog.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698