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

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

Issue 2125473002: Remove WebKit version from the About page on Chrome OS and the Blink version from chrome://version. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: superfluous include Created 4 years, 5 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/browser/resources/help/help_content.html ('k') | 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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 28 matching lines...) Expand all
39 #include "chrome/common/url_constants.h" 39 #include "chrome/common/url_constants.h"
40 #include "chrome/grit/chromium_strings.h" 40 #include "chrome/grit/chromium_strings.h"
41 #include "chrome/grit/generated_resources.h" 41 #include "chrome/grit/generated_resources.h"
42 #include "components/google/core/browser/google_util.h" 42 #include "components/google/core/browser/google_util.h"
43 #include "components/policy/core/common/policy_namespace.h" 43 #include "components/policy/core/common/policy_namespace.h"
44 #include "components/version_info/version_info.h" 44 #include "components/version_info/version_info.h"
45 #include "content/public/browser/browser_thread.h" 45 #include "content/public/browser/browser_thread.h"
46 #include "content/public/browser/notification_service.h" 46 #include "content/public/browser/notification_service.h"
47 #include "content/public/browser/web_contents.h" 47 #include "content/public/browser/web_contents.h"
48 #include "content/public/browser/web_ui.h" 48 #include "content/public/browser/web_ui.h"
49 #include "content/public/common/user_agent.h"
50 #include "grit/components_chromium_strings.h" 49 #include "grit/components_chromium_strings.h"
51 #include "grit/components_google_chrome_strings.h" 50 #include "grit/components_google_chrome_strings.h"
52 #include "grit/components_strings.h" 51 #include "grit/components_strings.h"
53 #include "grit/generated_resources.h" 52 #include "grit/generated_resources.h"
54 #include "policy/policy_constants.h" 53 #include "policy/policy_constants.h"
55 #include "ui/base/l10n/l10n_util.h" 54 #include "ui/base/l10n/l10n_util.h"
56 #include "v8/include/v8.h" 55 #include "v8/include/v8.h"
57 56
58 #if defined(OS_CHROMEOS) 57 #if defined(OS_CHROMEOS)
59 #include "base/files/file_util_proxy.h" 58 #include "base/files/file_util_proxy.h"
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 {"channelChangePageDelayedChangeTitle", 290 {"channelChangePageDelayedChangeTitle",
292 IDS_ABOUT_PAGE_CHANNEL_CHANGE_PAGE_DELAYED_CHANGE_TITLE}, 291 IDS_ABOUT_PAGE_CHANNEL_CHANGE_PAGE_DELAYED_CHANGE_TITLE},
293 {"channelChangePageUnstableTitle", 292 {"channelChangePageUnstableTitle",
294 IDS_ABOUT_PAGE_CHANNEL_CHANGE_PAGE_UNSTABLE_TITLE}, 293 IDS_ABOUT_PAGE_CHANNEL_CHANGE_PAGE_UNSTABLE_TITLE},
295 {"channelChangePagePowerwashButton", 294 {"channelChangePagePowerwashButton",
296 IDS_ABOUT_PAGE_CHANNEL_CHANGE_PAGE_POWERWASH_BUTTON}, 295 IDS_ABOUT_PAGE_CHANNEL_CHANGE_PAGE_POWERWASH_BUTTON},
297 {"channelChangePageChangeButton", 296 {"channelChangePageChangeButton",
298 IDS_ABOUT_PAGE_CHANNEL_CHANGE_PAGE_CHANGE_BUTTON}, 297 IDS_ABOUT_PAGE_CHANNEL_CHANGE_PAGE_CHANGE_BUTTON},
299 {"channelChangePageCancelButton", 298 {"channelChangePageCancelButton",
300 IDS_ABOUT_PAGE_CHANNEL_CHANGE_PAGE_CANCEL_BUTTON}, 299 IDS_ABOUT_PAGE_CHANNEL_CHANGE_PAGE_CANCEL_BUTTON},
301 {"webkit", IDS_WEBKIT},
302 {"userAgent", IDS_VERSION_UI_USER_AGENT}, 300 {"userAgent", IDS_VERSION_UI_USER_AGENT},
303 {"commandLine", IDS_VERSION_UI_COMMAND_LINE}, 301 {"commandLine", IDS_VERSION_UI_COMMAND_LINE},
304 {"buildDate", IDS_VERSION_UI_BUILD_DATE}, 302 {"buildDate", IDS_VERSION_UI_BUILD_DATE},
305 #endif 303 #endif
306 #if defined(OS_MACOSX) || defined(OS_WIN) 304 #if defined(OS_MACOSX) || defined(OS_WIN)
307 {"learnMore", IDS_LEARN_MORE}, 305 {"learnMore", IDS_LEARN_MORE},
308 #endif 306 #endif
309 #if defined(OS_MACOSX) 307 #if defined(OS_MACOSX)
310 {"promote", IDS_ABOUT_CHROME_PROMOTE_UPDATER}, 308 {"promote", IDS_ABOUT_CHROME_PROMOTE_UPDATER},
311 #endif 309 #endif
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 localized_strings->SetString( 369 localized_strings->SetString(
372 "eolLearnMore", l10n_util::GetStringFUTF16( 370 "eolLearnMore", l10n_util::GetStringFUTF16(
373 IDS_ABOUT_PAGE_EOL_LEARN_MORE, 371 IDS_ABOUT_PAGE_EOL_LEARN_MORE,
374 base::ASCIIToUTF16(chrome::kEolNotificationURL))); 372 base::ASCIIToUTF16(chrome::kEolNotificationURL)));
375 #endif 373 #endif
376 374
377 base::string16 tos = l10n_util::GetStringFUTF16( 375 base::string16 tos = l10n_util::GetStringFUTF16(
378 IDS_ABOUT_TERMS_OF_SERVICE, base::UTF8ToUTF16(chrome::kChromeUITermsURL)); 376 IDS_ABOUT_TERMS_OF_SERVICE, base::UTF8ToUTF16(chrome::kChromeUITermsURL));
379 localized_strings->SetString("productTOS", tos); 377 localized_strings->SetString("productTOS", tos);
380 378
381 localized_strings->SetString("webkitVersion", content::GetWebKitVersion());
Dan Beam 2016/07/06 18:26:52 the number stays the same but the sha1 doesn't, i.
382
383 localized_strings->SetString("jsEngine", "V8"); 379 localized_strings->SetString("jsEngine", "V8");
384 localized_strings->SetString("jsEngineVersion", v8::V8::GetVersion()); 380 localized_strings->SetString("jsEngineVersion", v8::V8::GetVersion());
385 381
386 localized_strings->SetString("userAgentInfo", GetUserAgent()); 382 localized_strings->SetString("userAgentInfo", GetUserAgent());
387 383
388 base::CommandLine::StringType command_line = 384 base::CommandLine::StringType command_line =
389 base::CommandLine::ForCurrentProcess()->GetCommandLineString(); 385 base::CommandLine::ForCurrentProcess()->GetCommandLineString();
390 localized_strings->SetString("commandLineInfo", command_line); 386 localized_strings->SetString("commandLineInfo", command_line);
391 } 387 }
392 388
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 base::StringValue("")); 772 base::StringValue(""));
777 } else { 773 } else {
778 base::string16 message = GetEolMessage(status); 774 base::string16 message = GetEolMessage(status);
779 web_ui()->CallJavascriptFunctionUnsafe( 775 web_ui()->CallJavascriptFunctionUnsafe(
780 "help.HelpPage.updateEolMessage", base::StringValue("device_endoflife"), 776 "help.HelpPage.updateEolMessage", base::StringValue("device_endoflife"),
781 base::StringValue(message)); 777 base::StringValue(message));
782 } 778 }
783 } 779 }
784 780
785 #endif // defined(OS_CHROMEOS) 781 #endif // defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/resources/help/help_content.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698