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

chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_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/autocomplete/autocomplete_popup_contents_view.h"
 
-#if defined(OS_WIN)
-#include <commctrl.h>
-#include <dwmapi.h>
-#include <objidl.h>
-#endif
-
 #include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/instant/instant_confirm_dialog.h"
 #include "chrome/browser/instant/promo_counter.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/views/autocomplete/autocomplete_result_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/path.h"
 #include "unicode/ubidi.h"
 #include "views/bubble/bubble_border.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/label.h"
 #include "views/layout/grid_layout.h"
 #include "views/layout/layout_constants.h"
 #include "views/painter.h"
 #include "views/widget/widget.h"
 
 #if defined(OS_WIN)
+#include <commctrl.h>
+#include <dwmapi.h>
+#include <objidl.h>
+
 #include "base/win/scoped_gdi_object.h"
 #if !defined(USE_AURA)
 #include "views/widget/native_widget_win.h"
 #endif
 #endif
 
 #if defined(TOOLKIT_USES_GTK)
 #include "ui/gfx/skia_utils_gtk.h"
 #endif
 
@@ skipping 91 matching lines @@
 }  // namespace
 
 class AutocompletePopupContentsView::AutocompletePopupWidget
     : public views::Widget,
       public base::SupportsWeakPtr<AutocompletePopupWidget> {
  public:
   AutocompletePopupWidget() {}
   virtual ~AutocompletePopupWidget() {}
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(AutocompletePopupWidget);
+   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupWidget);
 };
 
 class AutocompletePopupContentsView::InstantOptInView
     : public views::View,
       public views::ButtonListener {
  public:
   InstantOptInView(AutocompletePopupContentsView* contents_view,
                    const gfx::Font& label_font,
                    const gfx::Font& button_font)
       : contents_view_(contents_view),
         bg_painter_(views::Painter::CreateVerticalGradient(
                         SkColorSetRGB(255, 242, 183),
                         SkColorSetRGB(250, 230, 145))) {
     views::Label* label = new views::Label(
-        l10n_util::GetStringUTF16(IDS_INSTANT_OPT_IN_LABEL));
+        UTF16ToWide(l10n_util::GetStringUTF16(IDS_INSTANT_OPT_IN_LABEL)));
     label->SetFont(label_font);
 
     views::GridLayout* layout = new views::GridLayout(this);
     layout->SetInsets(kOptInTopPadding, kOptInLeftPadding,
                       kOptInBottomPadding, kOptInRightPadding);
     SetLayoutManager(layout);
 
     const int first_column_set = 1;
     views::GridLayout::Alignment v_align = views::GridLayout::CENTER;
     views::ColumnSet* column_set = layout->AddColumnSet(first_column_set);
@@ skipping 27 matching lines @@
                         width() - kOptInBackgroundHInset * 2,
                         height() - kOptInBackgroundVInset * 2);
     canvas->Restore();
   }
 
  private:
   // Creates and returns a button configured for the opt-in promo.
   views::View* CreateButton(int id, const gfx::Font& font) {
     // NOTE: we can't use NativeButton as the popup is a layered window and
     // native buttons don't draw  in layered windows.
-    // TODO(sky): these buttons look crap. Figure out the right
-    // border/background to use.
+    // TODO: these buttons look crap. Figure out the right border/background to
+    // use.
     views::TextButton* button =
         new views::TextButton(this, UTF16ToWide(l10n_util::GetStringUTF16(id)));
     button->set_border(new OptInButtonBorder());
     button->set_tag(id);
     button->SetFont(font);
     button->set_animate_on_state_change(false);
     return button;
   }
 
   AutocompletePopupContentsView* contents_view_;
@@ skipping 87 matching lines @@
       popup_->Close();  // This will eventually delete the popup.
       popup_.reset();
     }
     return;
   }
 
   // Update the match cached by each row, in the process of doing so make sure
   // we have enough row views.
   size_t child_rv_count = child_count();
   if (opt_in_view_) {
-    DCHECK_GT(child_rv_count, 0u);
+    DCHECK(child_rv_count > 0);
     child_rv_count--;
   }
   for (size_t i = 0; i < model_->result().size(); ++i) {
     AutocompleteResultView* result_view;
     if (i >= child_rv_count) {
       result_view =
           CreateResultView(this, i, result_font_, result_bold_font_);
       AddChildViewAt(result_view, static_cast<int>(i));
     } else {
       result_view = static_cast<AutocompleteResultView*>(child_at(i));
@@ skipping 32 matching lines @@
     params.transparent = true;
     params.parent_widget = location_bar_->GetWidget();
     params.bounds = GetPopupBounds();
     popup_->Init(params);
     popup_->SetContentsView(this);
     popup_->MoveAbove(
         GetRelativeWindowForPopup(omnibox_view_->GetNativeView()));
     if (!popup_.get()) {
       // For some IMEs GetRelativeWindowForPopup triggers the omnibox to lose
       // focus, thereby closing (and destroying) the popup.
-      // TODO(sky): this won't be needed once we close the omnibox on input
-      // window showing.
+      // TODO: this won't be needed once we close the omnibox on input window
+      // showing.
       return;
     }
     popup_->Show();
   } else {
     // Animate the popup shrinking, but don't animate growing larger since that
     // would make the popup feel less responsive.
     start_bounds_ = GetWidget()->GetWindowScreenBounds();
     if (target_bounds_.height() < start_bounds_.height())
       size_animation_.Show();
     else
@@ skipping 322 matching lines @@
   opt_in_view_ = NULL;
   PromoCounter* counter = profile_->GetInstantPromoCounter();
   DCHECK(counter);
   counter->Hide();
   if (opt_in) {
     browser::ShowInstantConfirmDialogIfNecessary(
         location_bar_->GetWidget()->GetNativeWindow(), profile_);
   }
   UpdatePopupAppearance();
 }