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

Side by Side Diff: chrome/browser/ui/webui/help/help_handler.cc

Issue 326773003: Add "64-bit" to Chrome's 'about' page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
« no previous file with comments | « no previous file | no next file » | 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/browser/ui/webui/help/help_handler.h" 5 #include "chrome/browser/ui/webui/help/help_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 chrome::VersionInfo::GetVersionStringModifier(); 72 chrome::VersionInfo::GetVersionStringModifier();
73 if (!version_modifier.empty()) 73 if (!version_modifier.empty())
74 browser_version += " " + version_modifier; 74 browser_version += " " + version_modifier;
75 75
76 #if !defined(GOOGLE_CHROME_BUILD) 76 #if !defined(GOOGLE_CHROME_BUILD)
77 browser_version += " ("; 77 browser_version += " (";
78 browser_version += version_info.LastChange(); 78 browser_version += version_info.LastChange();
79 browser_version += ")"; 79 browser_version += ")";
80 #endif 80 #endif
81 81
82 #if defined(ARCH_CPU_64_BITS)
83 browser_version += " (64-bit)";
84 #endif
85
82 return base::UTF8ToUTF16(browser_version); 86 return base::UTF8ToUTF16(browser_version);
83 } 87 }
84 88
85 #if defined(OS_CHROMEOS) 89 #if defined(OS_CHROMEOS)
86 90
87 // Returns message that informs user that for update it's better to 91 // Returns message that informs user that for update it's better to
88 // connect to a network of one of the allowed types. 92 // connect to a network of one of the allowed types.
89 base::string16 GetAllowedConnectionTypesMessage() { 93 base::string16 GetAllowedConnectionTypesMessage() {
90 if (help_utils_chromeos::IsUpdateOverCellularAllowed()) { 94 if (help_utils_chromeos::IsUpdateOverCellularAllowed()) {
91 return l10n_util::GetStringUTF16(IDS_UPGRADE_NETWORK_LIST_CELLULAR_ALLOWED); 95 return l10n_util::GetStringUTF16(IDS_UPGRADE_NETWORK_LIST_CELLULAR_ALLOWED);
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 web_ui()->CallJavascriptFunction( 549 web_ui()->CallJavascriptFunction(
546 "help.HelpPage.updateCurrentChannel", base::StringValue(channel)); 550 "help.HelpPage.updateCurrentChannel", base::StringValue(channel));
547 } 551 }
548 552
549 void HelpHandler::OnTargetChannel(const std::string& channel) { 553 void HelpHandler::OnTargetChannel(const std::string& channel) {
550 web_ui()->CallJavascriptFunction( 554 web_ui()->CallJavascriptFunction(
551 "help.HelpPage.updateTargetChannel", base::StringValue(channel)); 555 "help.HelpPage.updateTargetChannel", base::StringValue(channel));
552 } 556 }
553 557
554 #endif // defined(OS_CHROMEOS) 558 #endif // defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698