OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "components/omnibox/browser/autocomplete_controller.h" | 5 #include "components/omnibox/browser/autocomplete_controller.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 14 matching lines...) Expand all Loading... | |
25 #include "components/omnibox/browser/clipboard_url_provider.h" | 25 #include "components/omnibox/browser/clipboard_url_provider.h" |
26 #include "components/omnibox/browser/history_quick_provider.h" | 26 #include "components/omnibox/browser/history_quick_provider.h" |
27 #include "components/omnibox/browser/history_url_provider.h" | 27 #include "components/omnibox/browser/history_url_provider.h" |
28 #include "components/omnibox/browser/keyword_provider.h" | 28 #include "components/omnibox/browser/keyword_provider.h" |
29 #include "components/omnibox/browser/omnibox_field_trial.h" | 29 #include "components/omnibox/browser/omnibox_field_trial.h" |
30 #include "components/omnibox/browser/physical_web_provider.h" | 30 #include "components/omnibox/browser/physical_web_provider.h" |
31 #include "components/omnibox/browser/search_provider.h" | 31 #include "components/omnibox/browser/search_provider.h" |
32 #include "components/omnibox/browser/shortcuts_provider.h" | 32 #include "components/omnibox/browser/shortcuts_provider.h" |
33 #include "components/omnibox/browser/zero_suggest_provider.h" | 33 #include "components/omnibox/browser/zero_suggest_provider.h" |
34 #include "components/open_from_clipboard/clipboard_recent_content.h" | 34 #include "components/open_from_clipboard/clipboard_recent_content.h" |
35 #if !defined(OS_IOS) | |
36 #include "components/open_from_clipboard/clipboard_recent_content_generic.h" | |
37 #endif | |
38 #include "components/search_engines/template_url.h" | 35 #include "components/search_engines/template_url.h" |
39 #include "components/search_engines/template_url_service.h" | 36 #include "components/search_engines/template_url_service.h" |
40 #include "components/strings/grit/components_strings.h" | 37 #include "components/strings/grit/components_strings.h" |
41 #include "ui/base/l10n/l10n_util.h" | 38 #include "ui/base/l10n/l10n_util.h" |
42 | 39 |
40 #if !defined(OS_IOS) | |
41 #include "components/open_from_clipboard/clipboard_recent_content_generic.h" | |
42 #endif | |
43 | |
43 namespace { | 44 namespace { |
44 | 45 |
45 // Converts the given match to a type (and possibly subtype) based on the AQS | 46 // Converts the given match to a type (and possibly subtype) based on the AQS |
46 // specification. For more details, see | 47 // specification. For more details, see |
47 // http://goto.google.com/binary-clients-logging. | 48 // http://goto.google.com/binary-clients-logging. |
48 void AutocompleteMatchToAssistedQuery( | 49 void AutocompleteMatchToAssistedQuery( |
49 const AutocompleteMatch::Type& match, | 50 const AutocompleteMatch::Type& match, |
50 const AutocompleteProvider* provider, | 51 const AutocompleteProvider* provider, |
51 size_t* type, | 52 size_t* type, |
52 size_t* subtype) { | 53 size_t* subtype) { |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
234 } | 235 } |
235 if (provider_types & AutocompleteProvider::TYPE_CLIPBOARD_URL) { | 236 if (provider_types & AutocompleteProvider::TYPE_CLIPBOARD_URL) { |
236 #if !defined(OS_IOS) | 237 #if !defined(OS_IOS) |
237 // On iOS, a global ClipboardRecentContent should've been created by now | 238 // On iOS, a global ClipboardRecentContent should've been created by now |
238 // (if enabled). If none has been created (e.g., we're on a different | 239 // (if enabled). If none has been created (e.g., we're on a different |
239 // platform), use the generic implementation, which AutocompleteController | 240 // platform), use the generic implementation, which AutocompleteController |
240 // will own. Don't try to create a generic implementation on iOS because | 241 // will own. Don't try to create a generic implementation on iOS because |
241 // iOS doesn't want/need to link in the implementation and the libraries | 242 // iOS doesn't want/need to link in the implementation and the libraries |
242 // that would come with it. | 243 // that would come with it. |
243 if (!ClipboardRecentContent::GetInstance()) { | 244 if (!ClipboardRecentContent::GetInstance()) { |
244 clipboard_recent_content_ = | 245 ClipboardRecentContent::SetInstance(new ClipboardRecentContentGeneric()); |
Peter Kasting
2017/04/05 23:23:51
Nit: Might want a comment like "This pointer is in
Mark P
2017/04/06 17:58:00
Done.
| |
245 base::MakeUnique<ClipboardRecentContentGeneric>(); | |
246 ClipboardRecentContent::SetInstance(clipboard_recent_content_.get()); | |
247 } | 246 } |
248 #endif | 247 #endif |
249 // ClipboardRecentContent can be null in iOS tests. For non-iOS, we | 248 // ClipboardRecentContent can be null in iOS tests. For non-iOS, we |
250 // create a ClipboardRecentContent as above (for both Chrome and tests). | 249 // create a ClipboardRecentContent as above (for both Chrome and tests). |
251 if (ClipboardRecentContent::GetInstance()) { | 250 if (ClipboardRecentContent::GetInstance()) { |
252 providers_.push_back(new ClipboardURLProvider( | 251 providers_.push_back(new ClipboardURLProvider( |
253 provider_client_.get(), history_url_provider_, | 252 provider_client_.get(), history_url_provider_, |
254 ClipboardRecentContent::GetInstance())); | 253 ClipboardRecentContent::GetInstance())); |
255 } | 254 } |
256 } | 255 } |
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
699 expire_timer_.Stop(); | 698 expire_timer_.Stop(); |
700 stop_timer_.Stop(); | 699 stop_timer_.Stop(); |
701 done_ = true; | 700 done_ = true; |
702 if (clear_result && !result_.empty()) { | 701 if (clear_result && !result_.empty()) { |
703 result_.Reset(); | 702 result_.Reset(); |
704 // NOTE: We pass in false since we're trying to only clear the popup, not | 703 // NOTE: We pass in false since we're trying to only clear the popup, not |
705 // touch the edit... this is all a mess and should be cleaned up :( | 704 // touch the edit... this is all a mess and should be cleaned up :( |
706 NotifyChanged(false); | 705 NotifyChanged(false); |
707 } | 706 } |
708 } | 707 } |
OLD | NEW |