Revert 104076 - Change std::wstring to string16 for views::Link

chrome/browser/ui/views/about_chrome_view.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/views/about_chrome_view.h"
 
 #if defined(OS_WIN)
 #include <commdlg.h>
 #endif  // defined(OS_WIN)
 
@@ skipping 34 matching lines @@
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/views/restart_message_box.h"
 #include "chrome/installer/util/install_util.h"
 #endif  // defined(OS_WIN)
 
 namespace {
 // These are used as placeholder text around the links in the text in the about
 // dialog.
-const string16 kBeginLink(ASCIIToUTF16("BEGIN_LINK"));
-const string16 kEndLink(ASCIIToUTF16("END_LINK"));
-const string16 kBeginLinkChr(ASCIIToUTF16("BEGIN_LINK_CHR"));
-const string16 kBeginLinkOss(ASCIIToUTF16("BEGIN_LINK_OSS"));
-const string16 kEndLinkChr(ASCIIToUTF16("END_LINK_CHR"));
-const string16 kEndLinkOss(ASCIIToUTF16("END_LINK_OSS"));
+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";
 
 // The background bitmap used to draw the background color for the About box
 // and the separator line (this is the image we will draw the logo on top of).
 static const SkBitmap* kBackgroundBmp = NULL;
 
 // Returns a substring from |text| between start and end.
-string16 StringSubRange(const string16& text, size_t start, size_t end) {
+std::wstring StringSubRange(const std::wstring& text, size_t start,
+                            size_t end) {
   DCHECK(end > start);
   return text.substr(start, end - start);
 }
 
 }  // namespace
 
 namespace browser {
 
 // Declared in browser_dialogs.h so that others don't
 // need to depend on our .h.
@@ skipping 78 matching lines @@
   // layout of the view.
   about_dlg_background_logo_ = new views::ImageView();
   SkBitmap* about_background_logo = rb.GetBitmapNamed(base::i18n::IsRTL() ?
       IDR_ABOUT_BACKGROUND_RTL : IDR_ABOUT_BACKGROUND);
 
   about_dlg_background_logo_->SetImage(*about_background_logo);
   AddChildView(about_dlg_background_logo_);
 
   // Add the dialog labels.
   about_title_label_ = new views::Label(
-      l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   about_title_label_->SetFont(ResourceBundle::GetSharedInstance().GetFont(
       ResourceBundle::BaseFont).DeriveFont(18));
   about_title_label_->SetColor(SK_ColorBLACK);
   AddChildView(about_title_label_);
 
   // This is a text field so people can copy the version number from the dialog.
   version_label_ = new views::Textfield();
   chrome::VersionInfo version_info;
   version_label_->SetText(UTF8ToUTF16(version_info.CreateVersionString()));
   version_label_->SetReadOnly(true);
   version_label_->RemoveBorder();
   version_label_->SetTextColor(SK_ColorBLACK);
   version_label_->SetBackgroundColor(SK_ColorWHITE);
   version_label_->SetFont(ResourceBundle::GetSharedInstance().GetFont(
       ResourceBundle::BaseFont));
   AddChildView(version_label_);
 
   // The copyright URL portion of the main label.
   copyright_label_ = new views::Label(
-      l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_COPYRIGHT));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_COPYRIGHT)));
   copyright_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(copyright_label_);
 
-  main_text_label_ = new views::Label(string16());
+  main_text_label_ = new views::Label(L"");
 
   // Figure out what to write in the main label of the About box.
-  string16 text = l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_LICENSE);
+  std::wstring text =
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_LICENSE));
 
   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);
 
   main_label_chunk1_ = text.substr(0, link1);
-  main_label_chunk2_ = StringSubRange(text, link1_end + kEndLinkOss.size(),
+  main_label_chunk2_ = StringSubRange(text, link1_end + wcslen(kEndLinkOss),
                                       link2);
-  main_label_chunk3_ = text.substr(link2_end + kEndLinkOss.size());
+  main_label_chunk3_ = text.substr(link2_end + wcslen(kEndLinkOss));
 
   // The Chromium link within the main text of the dialog.
   chromium_url_ = new views::Link(
-      StringSubRange(text, text.find(kBeginLinkChr) + kBeginLinkChr.size(),
+      StringSubRange(text, text.find(kBeginLinkChr) + wcslen(kBeginLinkChr),
                      text.find(kEndLinkChr)));
   AddChildView(chromium_url_);
   chromium_url_->set_listener(this);
 
   // The Open Source link within the main text of the dialog.
   open_source_url_ = new views::Link(
-      StringSubRange(text, text.find(kBeginLinkOss) + kBeginLinkOss.size(),
+      StringSubRange(text, text.find(kBeginLinkOss) + wcslen(kBeginLinkOss),
                      text.find(kEndLinkOss)));
   AddChildView(open_source_url_);
   open_source_url_->set_listener(this);
 
   // Add together all the strings in the dialog for the purpose of calculating
   // the height of the dialog. The space for the Terms of Service string is not
   // included (it is added later, if needed).
-  string16 full_text = main_label_chunk1_ + chromium_url_->GetText() +
-                       main_label_chunk2_ + open_source_url_->GetText() +
-                       main_label_chunk3_;
+  std::wstring full_text = main_label_chunk1_ + chromium_url_->GetText() +
+                           main_label_chunk2_ + open_source_url_->GetText() +
+                           main_label_chunk3_;
 
   dialog_dimensions_ = views::Widget::GetLocalizedContentsSize(
       IDS_ABOUT_DIALOG_WIDTH_CHARS,
       IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES);
 
   // Create a label and add the full text so we can query it for the height.
   views::Label dummy_text(full_text);
   dummy_text.SetMultiLine(true);
   gfx::Font font =
       ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
@@ skipping 155 matching lines @@
       &chromium_url_rect_ : &open_source_url_rect_;
   gfx::Rect* rect2 = chromium_url_appears_first_ ?
       &open_source_url_rect_ : &chromium_url_rect_;
 
   // This struct keeps track of where to write the next word (which x,y
   // pixel coordinate). This struct is updated after drawing text and checking
   // if we need to wrap.
   gfx::Size position;
   // Draw the first text chunk and position the Chromium url.
   view_text_utils::DrawTextAndPositionUrl(canvas, main_text_label_,
-      UTF16ToWideHack(main_label_chunk1_), link1, rect1, &position,
-      text_direction_is_rtl_, label_bounds, font);
+      main_label_chunk1_, link1, rect1, &position, text_direction_is_rtl_,
+      label_bounds, font);
   // Draw the second text chunk and position the Open Source url.
   view_text_utils::DrawTextAndPositionUrl(canvas, main_text_label_,
-      UTF16ToWideHack(main_label_chunk2_), link2, rect2, &position,
-      text_direction_is_rtl_, label_bounds, font);
+      main_label_chunk2_, link2, rect2, &position, text_direction_is_rtl_,
+      label_bounds, font);
   // Draw the third text chunk (which has no URL associated with it).
   view_text_utils::DrawTextAndPositionUrl(canvas, main_text_label_,
-      UTF16ToWideHack(main_label_chunk3_), NULL, NULL, &position,
-      text_direction_is_rtl_, label_bounds, font);
+      main_label_chunk3_, NULL, NULL, &position, text_direction_is_rtl_,
+      label_bounds, font);
 
 #if defined(GOOGLE_CHROME_BUILD)
   // Insert a line break and some whitespace.
   position.set_width(0);
   position.Enlarge(0, font.GetHeight() + views::kRelatedControlVerticalSpacing);
 
   // And now the Terms of Service and position the TOS url.
   view_text_utils::DrawTextAndPositionUrl(canvas, main_text_label_,
       main_label_chunk4_, terms_of_service_url_, &terms_of_service_url_rect_,
       &position, text_direction_is_rtl_, label_bounds, font);
@@ skipping 263 matching lines @@
               IDS_UPGRADE_SUCCESSFUL_RELAUNCH,
               l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
       update_label_.SetText(update_string);
       show_success_indicator = true;
       break;
     }
     case UPGRADE_ERROR:
       UserMetrics::RecordAction(UserMetricsAction("UpgradeCheck_Error"));
       restart_button_visible_ = false;
       if (error_code != GOOGLE_UPDATE_DISABLED_BY_POLICY) {
-        update_label_.SetText(
-            l10n_util::GetStringFUTF16Int(IDS_UPGRADE_ERROR, error_code));
+        update_label_.SetText(UTF16ToWide(
+            l10n_util::GetStringFUTF16Int(IDS_UPGRADE_ERROR, error_code)));
       } else {
-        update_label_.SetText(
-            l10n_util::GetStringUTF16(IDS_UPGRADE_DISABLED_BY_POLICY));
+        update_label_.SetText(UTF16ToWide(
+            l10n_util::GetStringUTF16(IDS_UPGRADE_DISABLED_BY_POLICY)));
       }
       show_timeout_indicator = true;
       break;
     default:
       NOTREACHED();
   }
 
   success_indicator_.SetVisible(show_success_indicator);
   update_available_indicator_.SetVisible(show_update_available_indicator);
   timeout_indicator_.SetVisible(show_timeout_indicator);
   update_label_.SetVisible(show_update_label);
   throbber_->SetVisible(show_throbber);
   if (show_throbber)
     throbber_->Start();
   else
     throbber_->Stop();
 
   // We have updated controls on the parent, so we need to update its layout.
   parent()->Layout();
 
   // Check button may have appeared/disappeared. We cannot call this during
   // ViewHierarchyChanged because the view hasn't been added to a Widget yet.
   if (GetWidget())
     GetDialogClientView()->UpdateDialogButtons();
 }
 
 #endif