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

chrome/browser/chromeos/input_method/candidate_window.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/chromeos/input_method/candidate_window.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 226 matching lines @@
   // |wrapped_shortcut_label|, hence it's deleted when
   // |wrapped_shortcut_label| is deleted.
   views::Label* shortcut_label = CreateShortcutLabel(lookup_table.orientation);
   scoped_ptr<views::View> wrapped_shortcut_label(
       CreateWrappedShortcutLabel(shortcut_label, lookup_table.orientation));
 
   // Compute the max width in shortcut labels.
   // We'll create temporary shortcut labels, and choose the largest width.
   for (int i = 0; i < lookup_table.page_size; ++i) {
     shortcut_label->SetText(
-        WideToUTF16Hack(CreateShortcutText(i, lookup_table.orientation)));
+        CreateShortcutText(i, lookup_table.orientation));
     shortcut_column_width =
         std::max(shortcut_column_width,
                  wrapped_shortcut_label->GetPreferredSize().width());
   }
 
   return shortcut_column_width;
 }
 
 // Computes the page index. For instance, if the page size is 9, and the
 // cursor is pointing to 13th candidate, the page index will be 1 (2nd
@@ skipping 16 matching lines @@
   if (current_page_index < 0)
     return 0;
   const size_t start_from = current_page_index * lookup_table.page_size;
 
   // Compute the max width in candidate labels.
   // We'll create temporary candidate labels, and choose the largest width.
   for (size_t i = 0; i + start_from < lookup_table.candidates.size(); ++i) {
     const size_t index = start_from + i;
 
     candidate_label->SetText(
-        UTF8ToUTF16(lookup_table.candidates[index]));
+        UTF8ToWide(lookup_table.candidates[index]));
     candidate_column_width =
         std::max(candidate_column_width,
                  candidate_label->GetPreferredSize().width());
   }
 
   return candidate_column_width;
 }
 
 // Computes annotation column width.
 int ComputeAnnotationColumnWidth(const InputMethodLookupTable& lookup_table) {
   int annotation_column_width = 0;
   scoped_ptr<views::Label> annotation_label(
       CreateAnnotationLabel(lookup_table.orientation));
 
   // Compute the start index of |lookup_table_|.
   const int current_page_index = ComputePageIndex(lookup_table);
   if (current_page_index < 0)
     return 0;
   const size_t start_from = current_page_index * lookup_table.page_size;
 
   // Compute max width in annotation labels.
   // We'll create temporary annotation labels, and choose the largest width.
   for (size_t i = 0; i + start_from < lookup_table.annotations.size(); ++i) {
     const size_t index = start_from + i;
 
     annotation_label->SetText(
-        UTF8ToUTF16(lookup_table.annotations[index]));
+        UTF8ToWide(lookup_table.annotations[index]));
     annotation_column_width =
         std::max(annotation_column_width,
                  annotation_label->GetPreferredSize().width());
   }
 
   return annotation_column_width;
 }
 
 // HidableArea is used as an area to place optional information that can be
 // turned displaying off if it is unnecessary.
@@ skipping 67 matching lines @@
     contents->set_border(
         views::Border::CreateSolidBorder(1, kFrameColor));
     contents->set_background(
         views::Background::CreateVerticalGradientBackground(
             kFooterTopColor,
             kFooterBottomColor));
   }
 
   // Set the displayed text.
   void SetText(const std::string& utf8_text) {
-    label_->SetText(UTF8ToUTF16(utf8_text));
+    label_->SetText(UTF8ToWide(utf8_text));
   }
 
  protected:
   virtual gfx::Size GetPreferredSize() OVERRIDE {
     gfx::Size size = HidableArea::GetPreferredSize();
     // Hack. +2 is needed as the same reason as in VerticalCandidateLabel
     size.set_width(size.width() + 2);
     if (size.width() < minWidth_) {
       size.set_width(minWidth_);
     }
@@ skipping 238 matching lines @@
   // The infolist icon.
   views::Label* infolist_label_;
   bool infolist_icon_enabled_;
 };
 
 class InfolistView;
 
 // InfolistWindowView is the main container of the infolist window UI.
 class InfolistWindowView : public views::View {
  public:
+
   InfolistWindowView(
       views::Widget* parent_frame, views::Widget* candidate_window_frame);
   virtual ~InfolistWindowView();
   void Init();
   void Show();
   void DelayShow(unsigned int milliseconds);
   void Hide();
   void DelayHide(unsigned int milliseconds);
   void UpdateCandidates(const InputMethodLookupTable& lookup_table);
 
@@ skipping 189 matching lines @@
   layout->AddView(wrapped_shortcut_label);
   layout->AddView(candidate_label_);
   layout->AddView(annotation_label_);
   if (orientation_ == InputMethodLookupTable::kVertical) {
     layout->AddView(WrapWithPadding(infolist_label_,
         gfx::Insets(2, 0, 2, 0)));
   }
 }
 
 void CandidateView::SetCandidateText(const std::wstring& text) {
-  candidate_label_->SetText(WideToUTF16Hack(text));
+  candidate_label_->SetText(text);
 }
 
 void CandidateView::SetShortcutText(const std::wstring& text) {
-  shortcut_label_->SetText(WideToUTF16Hack(text));
+  shortcut_label_->SetText(text);
 }
 
 void CandidateView::SetAnnotationText(const std::wstring& text) {
-  annotation_label_->SetText(WideToUTF16Hack(text));
+  annotation_label_->SetText(text);
 }
 
 void CandidateView::SetInfolistIcon(bool enable) {
   if (!infolist_label_) {
     return;
   }
   if (enable) {
     infolist_label_->set_background(
         views::Background::CreateSolidBackground(kSelectedRowFrameColor));
   } else {
@@ skipping 523 matching lines @@
                          0, views::GridLayout::FIXED, 200, 0);
 
   layout->StartRow(0, 0);
   layout->AddView(wrapped_title_label);
   layout->StartRow(0, 0);
   layout->AddView(wrapped_description_label);
 }
 
 
 void InfolistView::SetTitleText(const std::wstring& text) {
-  title_label_->SetText(WideToUTF16Hack(text));
+  title_label_->SetText(text);
 }
 
 void InfolistView::SetDescriptionText(const std::wstring& text) {
-  description_label_->SetText(WideToUTF16Hack(text));
+  description_label_->SetText(text);
 }
 
 void InfolistView::Select() {
   set_background(
       views::Background::CreateSolidBackground(
           kSelectedInfolistRowBackgroundColor));
   set_border(
       views::Border::CreateSolidBorder(1, kSelectedInfolistRowFrameColor));
   // Need to call SchedulePaint() for background and border color changes.
   SchedulePaint();
@@ skipping 38 matching lines @@
                         0, views::GridLayout::USE_PREF, 0, 0);
   layout->SetInsets(1, 1, 1, 1);
 
   // Add the infolist area
   layout->StartRow(0, 0);
   views::Label* caption_label = NULL;
   caption_label = new views::Label;
   caption_label->SetFont(caption_label->font().DeriveFont(kFontSizeDelta - 2));
   caption_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   caption_label->SetText(
-      l10n_util::GetStringUTF16(IDS_INPUT_METHOD_INFOLIST_WINDOW_TITLE));
+      UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_INPUT_METHOD_INFOLIST_WINDOW_TITLE)));
   views::View* wrapped_caption_label =
       WrapWithPadding(caption_label, gfx::Insets(2, 2, 2, 2));
   wrapped_caption_label->set_background(
       views::Background::CreateSolidBackground(kInfolistTitleBackgroundColor));
   layout->AddView(wrapped_caption_label);
 
   layout->StartRow(0, 0);
   layout->AddView(infolist_area_);  // |infolist_area_| is owned by |this|.
 }
 
@@ skipping 304 matching lines @@
 CandidateWindowController::~CandidateWindowController() {
   delete impl_;
 }
 
 bool CandidateWindowController::Init() {
   return impl_->Init();
 }
 
 }  // namespace input_method
 }  // namespace chromeos