OLD | NEW |
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 #include "ui/app_list/search/history.h" | 5 #include "ui/app_list/search/history.h" |
6 | 6 |
7 #include "base/strings/string_util.h" | 7 #include "base/strings/string_util.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "ui/app_list/search/history_data.h" | 9 #include "ui/app_list/search/history_data.h" |
10 #include "ui/app_list/search/history_data_store.h" | 10 #include "ui/app_list/search/history_data_store.h" |
11 #include "ui/app_list/search/tokenized_string.h" | 11 #include "ui/app_list/search/tokenized_string.h" |
12 | 12 |
13 namespace app_list { | 13 namespace app_list { |
14 | 14 |
15 namespace { | 15 namespace { |
16 | 16 |
17 // Normalize the given string by joining all its tokens with a space. | 17 // Normalize the given string by joining all its tokens with a space. |
18 std::string NormalizeString(const std::string& utf8) { | 18 std::string NormalizeString(const std::string& utf8) { |
19 TokenizedString tokenized(base::UTF8ToUTF16(utf8)); | 19 TokenizedString tokenized(base::UTF8ToUTF16(utf8)); |
20 return base::UTF16ToUTF8(JoinString(tokenized.tokens(), ' ')); | 20 return base::UTF16ToUTF8( |
| 21 base::JoinString(tokenized.tokens(), base::ASCIIToUTF16(" "))); |
21 } | 22 } |
22 | 23 |
23 } // namespace | 24 } // namespace |
24 | 25 |
25 History::History(scoped_refptr<HistoryDataStore> store) | 26 History::History(scoped_refptr<HistoryDataStore> store) |
26 : store_(store), data_loaded_(false) { | 27 : store_(store), data_loaded_(false) { |
27 const size_t kMaxQueryEntries = 1000; | 28 const size_t kMaxQueryEntries = 1000; |
28 const size_t kMaxSecondaryQueries = 5; | 29 const size_t kMaxSecondaryQueries = 5; |
29 | 30 |
30 data_.reset( | 31 data_.reset( |
(...skipping 19 matching lines...) Expand all Loading... |
50 const std::string& query) const { | 51 const std::string& query) const { |
51 DCHECK(IsReady()); | 52 DCHECK(IsReady()); |
52 return data_->GetKnownResults(NormalizeString(query)).Pass(); | 53 return data_->GetKnownResults(NormalizeString(query)).Pass(); |
53 } | 54 } |
54 | 55 |
55 void History::OnHistoryDataLoadedFromStore() { | 56 void History::OnHistoryDataLoadedFromStore() { |
56 data_loaded_ = true; | 57 data_loaded_ = true; |
57 } | 58 } |
58 | 59 |
59 } // namespace app_list | 60 } // namespace app_list |
OLD | NEW |