Add base:: to string16s in win8/.

win8/metro_driver/ime/text_store.cc

 // Copyright 2013 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 "win8/metro_driver/ime/text_store.h"
 
 #include <algorithm>
 
 #include "base/win/scoped_variant.h"
 #include "ui/base/win/atl_module.h"
@@ skipping 249 matching lines @@
   if (acp_end == -1)
     acp_end = string_buffer_size;
   if (!((0 <= acp_start) &&
         (acp_start <= acp_end) &&
         (acp_end <= string_buffer_size))) {
     return TF_E_INVALIDPOS;
   }
   acp_end = std::min(acp_end, acp_start + static_cast<LONG>(text_buffer_size));
   *text_buffer_copied = acp_end - acp_start;
 
-  const string16& result =
+  const base::string16& result =
       string_buffer_.substr(acp_start, *text_buffer_copied);
   for (size_t i = 0; i < result.size(); ++i)
     text_buffer[i] = result[i];
 
   if (run_info_buffer_size) {
     run_info_buffer[0].uCount = *text_buffer_copied;
     run_info_buffer[0].type = TS_RT_PLAIN;
     *run_info_buffer_copied = 1;
   }
 
@@ skipping 126 matching lines @@
     return S_OK;
   }
 
   if (!HasReadWriteLock())
     return TS_E_NOLOCK;
   if (!text_buffer)
     return E_INVALIDARG;
 
   DCHECK_LE(start_pos, end_pos);
   string_buffer_ = string_buffer_.substr(0, start_pos) +
-                   string16(text_buffer, text_buffer + text_buffer_size) +
+                   base::string16(text_buffer, text_buffer + text_buffer_size) +
                    string_buffer_.substr(end_pos);
   if (acp_start)
     *acp_start = start_pos;
   if (acp_end)
     *acp_end = new_end_pos;
   if (text_change) {
     text_change->acpStart = start_pos;
     text_change->acpOldEnd = end_pos;
     text_change->acpNewEnd = new_end_pos;
   }
@@ skipping 90 matching lines @@
     current_lock_type_ = 0;
   }
 
   if (!edit_flag_)
     return S_OK;
 
   // If the text store is edited in OnLockGranted(), we may need to call
   // TextStoreDelegate::ConfirmComposition() or
   // TextStoreDelegate::SetComposition().
   const uint32 new_committed_size = committed_size_;
-  const string16& new_committed_string =
+  const base::string16& new_committed_string =
       string_buffer_.substr(last_committed_size,
                             new_committed_size - last_committed_size);
-  const string16& composition_string =
+  const base::string16& composition_string =
       string_buffer_.substr(new_committed_size);
 
   // If there is new committed string, calls
   // TextStoreDelegate::ConfirmComposition().
   if ((!new_committed_string.empty()))
     delegate_->OnTextCommitted(new_committed_string);
 
   // Calls TextInputClient::SetCompositionText().
   std::vector<metro_viewer::UnderlineInfo> underlines = underlines_;
   // Adjusts the offset.
@@ skipping 308 matching lines @@
   if (edit_flag_)
     return false;
 
   if (string_buffer_.empty())
     return true;
 
   // See the comment in TextStore::CancelComposition.
   // This logic is based on the observation about how to emulate
   // ImmNotifyIME(NI_COMPOSITIONSTR, CPS_COMPLETE, 0) by CUAS.
 
-  const string16& composition_text = string_buffer_.substr(committed_size_);
+  const base::string16& composition_text =
+      string_buffer_.substr(committed_size_);
   if (!composition_text.empty())
     delegate_->OnTextCommitted(composition_text);
 
   const uint32 previous_buffer_size =
       static_cast<uint32>(string_buffer_.size());
   string_buffer_.clear();
   committed_size_ = 0;
   selection_start_ = 0;
   selection_end_ = 0;
   if (text_store_acp_sink_mask_ & TS_AS_SEL_CHANGE)
@@ skipping 17 matching lines @@
 
 bool TextStore::HasReadLock() const {
   return (current_lock_type_ & TS_LF_READ) == TS_LF_READ;
 }
 
 bool TextStore::HasReadWriteLock() const {
   return (current_lock_type_ & TS_LF_READWRITE) == TS_LF_READWRITE;
 }
 
 }  // namespace metro_driver