Replace string16 with base::string16.

chrome/browser/chromeos/enrollment_dialog_view.cc

 // Copyright (c) 2012 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/enrollment_dialog_view.h"
 
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 31 matching lines @@
   static void ShowDialog(gfx::NativeWindow owning_window,
                          const std::string& network_name,
                          Profile* profile,
                          const GURL& target_uri,
                          const base::Closure& connect);
 
   // views::DialogDelegateView overrides
   virtual int GetDialogButtons() const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual void OnClosed() OVERRIDE;
-  virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
+  virtual base::string16 GetDialogButtonLabel(
+      ui::DialogButton button) const OVERRIDE;
 
   // views::WidgetDelegate overrides
   virtual ui::ModalType GetModalType() const OVERRIDE;
-  virtual string16 GetWindowTitle() const OVERRIDE;
+  virtual base::string16 GetWindowTitle() const OVERRIDE;
 
   // views::View overrides
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
  private:
   EnrollmentDialogView(const std::string& network_name,
                        Profile* profile,
                        const GURL& target_uri,
                        const base::Closure& connect);
   void InitDialog();
@@ skipping 52 matching lines @@
   if (!accepted_)
     return;
   chrome::NavigateParams params(profile_,
                                 GURL(target_uri_),
                                 content::PAGE_TRANSITION_LINK);
   params.disposition = NEW_FOREGROUND_TAB;
   params.window_action = chrome::NavigateParams::SHOW_WINDOW;
   chrome::Navigate(&params);
 }
 
-string16 EnrollmentDialogView::GetDialogButtonLabel(
+base::string16 EnrollmentDialogView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   if (button == ui::DIALOG_BUTTON_OK)
     return l10n_util::GetStringUTF16(IDS_NETWORK_ENROLLMENT_HANDLER_BUTTON);
   return views::DialogDelegateView::GetDialogButtonLabel(button);
 }
 
 ui::ModalType EnrollmentDialogView::GetModalType() const {
   return ui::MODAL_TYPE_SYSTEM;
 }
 
-string16 EnrollmentDialogView::GetWindowTitle() const {
+base::string16 EnrollmentDialogView::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_NETWORK_ENROLLMENT_HANDLER_TITLE);
 }
 
 gfx::Size EnrollmentDialogView::GetPreferredSize() {
   return gfx::Size(kDefaultWidth, kDefaultHeight);
 }
 
 void EnrollmentDialogView::InitDialog() {
   added_cert_ = false;
   // Create the views and layout manager and set them up.
@@ skipping 135 matching lines @@
   DialogEnrollmentDelegate* enrollment =
       new DialogEnrollmentDelegate(owning_window, network->name(),
                                    ProfileManager::GetDefaultProfile());
   return enrollment->Enroll(certificate_pattern.enrollment_uri_list(),
                             base::Bind(&EnrollmentComplete, service_path));
 }
 
 }  // namespace enrollment
 
 }  // namespace chromeos