Revise about: and chrome: url handling.

chrome/browser/ui/webui/options/about_page_handler.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/about_page_handler.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ skipping 169 matching lines @@
   localized_strings->SetString(chromium_url_appears_first ?
       "license_link_content_0" : "license_link_content_1",
       StringSubRange(text,
                      text.find(kBeginLinkChr) + strlen(kBeginLinkChr),
                      text.find(kEndLinkChr)));
   GURL url = google_util::AppendGoogleLocaleParam(
       GURL(chrome::kChromiumProjectURL));
   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.  We need to use
-  // the chrome:// variant instead of about:credits; the latter will get
-  // rewritten to about:blank.
+  // The Open Source link within the main text of the dialog.
   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::kChromeUIAboutCreditsURL);
+      "license_link_1" : "license_link_0", chrome::kChromeUICreditsURL);
 
 #if defined(OS_CHROMEOS)
   std::string cros_text =
       l10n_util::GetStringUTF8(IDS_ABOUT_CROS_VERSION_LICENSE);
 
   size_t cros_link = cros_text.find(kBeginLinkCrosOss);
   DCHECK(cros_link != std::string::npos);
   size_t cros_link_end = cros_text.find(kEndLinkCrosOss, cros_link);
   DCHECK(cros_link_end != std::string::npos);
 
   localized_strings->SetString("cros_license_content_0",
       cros_text.substr(0, cros_link));
   localized_strings->SetString("cros_license_content_1",
       cros_text.substr(cros_link_end + strlen(kEndLinkCrosOss)));
   localized_strings->SetString("cros_license_link_content_0",
       StringSubRange(cros_text, cros_link + strlen(kBeginLinkCrosOss),
                      cros_link_end));
   localized_strings->SetString("cros_license_link_0",
-      chrome::kChromeUIAboutOSCreditsURL);
+      chrome::kChromeUIOSCreditsURL);
 #endif
 
   // webkit
 
   localized_strings->SetString("webkit_version",
                                webkit_glue::GetWebKitVersion());
 
   // javascript
 
 #if defined(CHROME_V8)
@@ skipping 214 matching lines @@
   if (chromeos::CrosLibrary::Get()->GetUpdateLibrary()->HasObserver(observer)) {
     // If UpdateLibrary still has the observer, then the page handler is valid.
     AboutPageHandler* handler = observer->page_handler();
     scoped_ptr<Value> channel_string(Value::CreateStringValue(channel));
     handler->web_ui_->CallJavascriptFunction(
         "AboutPage.updateSelectedOptionCallback", *channel_string);
   }
 }
 
 #endif  // defined(OS_CHROMEOS)