Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Side by Side Diff: ui/app_list/search/term_break_iterator.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_APP_LIST_SEARCH_TERM_BREAK_ITERATOR_H_ 5 #ifndef UI_APP_LIST_SEARCH_TERM_BREAK_ITERATOR_H_
6 #define UI_APP_LIST_SEARCH_TERM_BREAK_ITERATOR_H_ 6 #define UI_APP_LIST_SEARCH_TERM_BREAK_ITERATOR_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory>
11
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
13 #include "ui/app_list/app_list_export.h" 14 #include "ui/app_list/app_list_export.h"
14 15
15 namespace base { 16 namespace base {
16 namespace i18n { 17 namespace i18n {
17 class UTF16CharIterator; 18 class UTF16CharIterator;
18 } 19 }
19 } 20 }
20 21
21 namespace app_list { 22 namespace app_list {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 STATE_LAST, 55 STATE_LAST,
55 }; 56 };
56 57
57 // Returns new state for given |ch|. 58 // Returns new state for given |ch|.
58 State GetNewState(base::char16 ch); 59 State GetNewState(base::char16 ch);
59 60
60 const base::string16& word_; 61 const base::string16& word_;
61 size_t prev_; 62 size_t prev_;
62 size_t pos_; 63 size_t pos_;
63 64
64 scoped_ptr<base::i18n::UTF16CharIterator> iter_; 65 std::unique_ptr<base::i18n::UTF16CharIterator> iter_;
65 State state_; 66 State state_;
66 67
67 DISALLOW_COPY_AND_ASSIGN(TermBreakIterator); 68 DISALLOW_COPY_AND_ASSIGN(TermBreakIterator);
68 }; 69 };
69 70
70 } // namespace app_list 71 } // namespace app_list
71 72
72 #endif // UI_APP_LIST_SEARCH_TERM_BREAK_ITERATOR_H_ 73 #endif // UI_APP_LIST_SEARCH_TERM_BREAK_ITERATOR_H_
OLDNEW
« no previous file with comments | « ui/app_list/search/mixer_unittest.cc ('k') | ui/app_list/search/tokenized_string_char_iterator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698