Prefix string16 with base:: in ui/.

ui/views/window/non_client_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 "ui/views/window/non_client_view.h"
 
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/views/rect_based_targeting_utils.h"
@@ skipping 109 matching lines @@
   // We need to manually call Layout here because layout for the frame view can
   // change independently of the bounds changing - e.g. after the initial
   // display of the window the metrics of the native window controls can change,
   // which does not change the bounds of the window but requires a re-layout to
   // trigger a repaint. We override OnBoundsChanged() for the NonClientFrameView
   // to do nothing so that SetBounds above doesn't cause Layout to be called
   // twice.
   frame_view_->Layout();
 }
 
-void NonClientView::SetAccessibleName(const string16& name) {
+void NonClientView::SetAccessibleName(const base::string16& name) {
   accessible_name_ = name;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientView, View overrides:
 
 gfx::Size NonClientView::GetPreferredSize() {
   // TODO(pkasting): This should probably be made to look similar to
   // GetMinimumSize() below.  This will require implementing GetPreferredSize()
   // better in the various frame views.
@@ skipping 175 matching lines @@
 const char* NonClientFrameView::GetClassName() const {
   return kViewClassName;
 }
 
 void NonClientFrameView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   // Overridden to do nothing. The NonClientView manually calls Layout on the
   // FrameView when it is itself laid out, see comment in NonClientView::Layout.
 }
 
 }  // namespace views