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

Unified Diff: chrome/browser/ui/webui/options/about_page_handler.cc

Issue 7064052: Revert 88142 to fix sync_integration_tests offline. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/ntp/new_tab_ui_uitest.cc ('k') | chrome/browser/ui/webui/options/options_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/about_page_handler.cc
===================================================================
--- chrome/browser/ui/webui/options/about_page_handler.cc (revision 88158)
+++ chrome/browser/ui/webui/options/about_page_handler.cc (working copy)
@@ -187,14 +187,16 @@
localized_strings->SetString(chromium_url_appears_first ?
"license_link_0" : "license_link_1", url.spec());
- // The Open Source link within the main text of the dialog.
+ // The Open Source link within the main text of the dialog. We need to use
+ // the chrome:// variant instead of about:credits; the latter will get
+ // rewritten to about:blank.
localized_strings->SetString(chromium_url_appears_first ?
"license_link_content_1" : "license_link_content_0",
StringSubRange(text,
text.find(kBeginLinkOss) + strlen(kBeginLinkOss),
text.find(kEndLinkOss)));
localized_strings->SetString(chromium_url_appears_first ?
- "license_link_1" : "license_link_0", chrome::kChromeUICreditsURL);
+ "license_link_1" : "license_link_0", chrome::kChromeUIAboutCreditsURL);
#if defined(OS_CHROMEOS)
std::string cros_text =
@@ -213,7 +215,7 @@
StringSubRange(cros_text, cros_link + strlen(kBeginLinkCrosOss),
cros_link_end));
localized_strings->SetString("cros_license_link_0",
- chrome::kChromeUIOSCreditsURL);
+ chrome::kChromeUIAboutOSCreditsURL);
#endif
// webkit
« no previous file with comments | « chrome/browser/ui/webui/ntp/new_tab_ui_uitest.cc ('k') | chrome/browser/ui/webui/options/options_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698