OLD | NEW |
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 Loading... |
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 Loading... |
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) |
OLD | NEW |