Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / app_list / search / term_break_iterator.h

diff --git a/src/chrome/browser/ui/app_list/search/term_break_iterator.h b/src/chrome/browser/ui/app_list/search/term_break_iterator.h
index eb1bf6a..303d0e3 100644 (file)
--- a/src/chrome/browser/ui/app_list/search/term_break_iterator.h
+++ b/src/chrome/browser/ui/app_list/search/term_break_iterator.h
@@ -26,7 +26,7 @@ namespace app_list {
 class TermBreakIterator {
  public:
   // Note that |word| must out live this iterator.
-  explicit TermBreakIterator(const string16& word);
+  explicit TermBreakIterator(const base::string16& word);
   ~TermBreakIterator();
 
   // Advance to the next term. Returns false if at the end of the word.
@@ -34,12 +34,12 @@ class TermBreakIterator {
 
   // Returns the current term, which is the substr of |word_| in range
   // [prev_, pos_).
-  const string16 GetCurrentTerm() const;
+  const base::string16 GetCurrentTerm() const;
 
   size_t prev() const { return prev_; }
   size_t pos() const { return pos_; }
 
-  static const size_t npos = -1;
+  static const size_t npos = static_cast<size_t>(-1);
 
  private:
   enum State {
@@ -52,9 +52,9 @@ class TermBreakIterator {
   };
 
   // Returns new state for given |ch|.
-  State GetNewState(char16 ch);
+  State GetNewState(base::char16 ch);
 
-  const string16& word_;
+  const base::string16& word_;
   size_t prev_;
   size_t pos_;