chromeos: Add OS credits link to about page.

chrome/browser/dom_ui/options/about_page_handler.cc

 // Copyright (c) 2010 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/dom_ui/options/about_page_handler.h"
 
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 31 matching lines @@
 namespace {
 
 // These are used as placeholder text around the links in the text in the
 // license.
 const wchar_t kBeginLink[] = L"BEGIN_LINK";
 const wchar_t kEndLink[] = L"END_LINK";
 const wchar_t kBeginLinkChr[] = L"BEGIN_LINK_CHR";
 const wchar_t kBeginLinkOss[] = L"BEGIN_LINK_OSS";
 const wchar_t kEndLinkChr[] = L"END_LINK_CHR";
 const wchar_t kEndLinkOss[] = L"END_LINK_OSS";
+#if defined(OS_CHROMEOS)
+const wchar_t kBeginLinkCrosOss[] = L"BEGIN_LINK_CROS_OSS";
+const wchar_t kEndLinkCrosOss[] = L"END_LINK_CROS_OSS";
+#endif
 
 // Returns a substring [start, end) from |text|.
 std::wstring StringSubRange(const std::wstring& text, size_t start,
                             size_t end) {
   DCHECK(end > start);
   return text.substr(start, end - start);
 }
 
 struct LocalizeEntry {
   const char* identifier;
@@ skipping 103 matching lines @@
   bool chromium_url_appears_first =
       text.find(kBeginLinkChr) < text.find(kBeginLinkOss);
 
   size_t link1 = text.find(kBeginLink);
   DCHECK(link1 != std::wstring::npos);
   size_t link1_end = text.find(kEndLink, link1);
   DCHECK(link1_end != std::wstring::npos);
   size_t link2 = text.find(kBeginLink, link1_end);
   DCHECK(link2 != std::wstring::npos);
   size_t link2_end = text.find(kEndLink, link2);
-  DCHECK(link1_end != std::wstring::npos);
+  DCHECK(link2_end != std::wstring::npos);

[Daniel Erat, 2010/12/29 01:11:44]

noticed this typo

 
   localized_strings->SetString("license_content_0",
       WideToUTF16Hack(text.substr(0, link1)));
   localized_strings->SetString("license_content_1",
       WideToUTF16Hack(StringSubRange(text, link1_end + wcslen(kEndLinkOss),
                                      link2)));
   localized_strings->SetString("license_content_2",
       WideToUTF16Hack(text.substr(link2_end + wcslen(kEndLinkOss))));
 
   // The Chromium link within the main text of the dialog.
@@ skipping 10 matching lines @@
   // 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",
       WideToUTF16Hack(StringSubRange(text,
           text.find(kBeginLinkOss) + wcslen(kBeginLinkOss),
           text.find(kEndLinkOss))));
   localized_strings->SetString(chromium_url_appears_first ?
       "license_link_1" : "license_link_0", chrome::kChromeUIAboutCreditsURL);
 
+#if defined(OS_CHROMEOS)
+  std::wstring cros_text = l10n_util::GetString(IDS_ABOUT_CROS_VERSION_LICENSE);
+
+  size_t cros_link = cros_text.find(kBeginLinkCrosOss);
+  DCHECK(cros_link != std::wstring::npos);
+  size_t cros_link_end = cros_text.find(kEndLinkCrosOss, cros_link);
+  DCHECK(cros_link_end != std::wstring::npos);
+
+  localized_strings->SetString("cros_license_content_0",
+      WideToUTF16Hack(cros_text.substr(0, cros_link)));

[Daniel Erat, 2010/12/29 01:11:44]

I tried to match the broken indenting of the rest of the file. :-/  Let me know
if I should clean everything up, at the cost of some vertical space.

[arv (Not doing code reviews), 2010/12/29 01:26:38]

Either way.

+  localized_strings->SetString("cros_license_content_1",
+      WideToUTF16Hack(
+          cros_text.substr(cros_link_end + wcslen(kEndLinkCrosOss))));
+  localized_strings->SetString("cros_license_link_content_0",
+      WideToUTF16Hack(StringSubRange(cros_text,
+          cros_link + wcslen(kBeginLinkCrosOss), cros_link_end)));
+  localized_strings->SetString("cros_license_link_0",
+      chrome::kChromeUIAboutOSCreditsURL);
+#endif
+
   // webkit
 
   localized_strings->SetString("webkit_version",
                                webkit_glue::GetWebKitVersion());
 
   // javascript
 
 #if defined(CHROME_V8)
   localized_strings->SetString("js_engine", "V8");
   localized_strings->SetString("js_engine_version", v8::V8::GetVersion());
@@ skipping 178 matching lines @@
 
 void AboutPageHandler::OnOSVersion(chromeos::VersionLoader::Handle handle,
                                    std::string version) {
   if (version.size()) {
     scoped_ptr<Value> version_string(Value::CreateStringValue(version));
     dom_ui_->CallJavascriptFunction(L"AboutPage.updateOSVersionCallback",
                                     *version_string);
   }
 }
 #endif