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

views/examples/examples_main.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 "views/examples/examples_main.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
 #include "base/process_util.h"
@@ skipping 85 matching lines @@
   examples_.push_back(new ScrollViewExample(this));
   examples_.push_back(new SingleSplitViewExample(this));
   examples_.push_back(new DoubleSplitViewExample(this));
 #if defined(OS_WIN)
   examples_.push_back(new TableExample(this));
 #endif
   examples_.push_back(new Table2Example(this));
   examples_.push_back(new WidgetExample(this));
   examples_.push_back(new MenuExample(this));
 
-  for (std::vector<ExampleBase*>::const_iterator i(examples_.begin());
+  for(std::vector<ExampleBase*>::const_iterator i(examples_.begin());
       i != examples_.end(); ++i)
     AddExample(*i);
 
   window->Show();
 }
 
 void ExamplesMain::SetStatus(const std::string& status) {
-  status_label_->SetText(UTF8ToUTF16(status));
+  status_label_->SetText(UTF8ToWide(status));
 }
 
 void ExamplesMain::AddExample(ExampleBase* example) {
   tabbed_pane_->AddTab(UTF8ToUTF16(example->example_title()),
                        example->example_view());
 }
 
 bool ExamplesMain::CanResize() const {
   return true;
 }
@@ skipping 58 matching lines @@
   main.Init();
 
   views::AcceleratorHandler accelerator_handler;
   MessageLoopForUI::current()->Run(&accelerator_handler);
 
 #if defined(OS_WIN)
   OleUninitialize();
 #endif
   return 0;
 }