| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/search_engines/template_url_service.h" | 5 #include "components/search_engines/template_url_service.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 #include "components/prefs/pref_service.h" | 26 #include "components/prefs/pref_service.h" |
| 27 #include "components/rappor/rappor_service.h" | 27 #include "components/rappor/rappor_service.h" |
| 28 #include "components/search_engines/search_engines_pref_names.h" | 28 #include "components/search_engines/search_engines_pref_names.h" |
| 29 #include "components/search_engines/search_host_to_urls_map.h" | 29 #include "components/search_engines/search_host_to_urls_map.h" |
| 30 #include "components/search_engines/search_terms_data.h" | 30 #include "components/search_engines/search_terms_data.h" |
| 31 #include "components/search_engines/template_url.h" | 31 #include "components/search_engines/template_url.h" |
| 32 #include "components/search_engines/template_url_prepopulate_data.h" | 32 #include "components/search_engines/template_url_prepopulate_data.h" |
| 33 #include "components/search_engines/template_url_service_client.h" | 33 #include "components/search_engines/template_url_service_client.h" |
| 34 #include "components/search_engines/template_url_service_observer.h" | 34 #include "components/search_engines/template_url_service_observer.h" |
| 35 #include "components/search_engines/util.h" | 35 #include "components/search_engines/util.h" |
| 36 #include "components/sync/api/sync_change.h" | 36 #include "components/sync/model/sync_change.h" |
| 37 #include "components/sync/api/sync_error_factory.h" | 37 #include "components/sync/model/sync_error_factory.h" |
| 38 #include "components/sync/protocol/search_engine_specifics.pb.h" | 38 #include "components/sync/protocol/search_engine_specifics.pb.h" |
| 39 #include "components/sync/protocol/sync.pb.h" | 39 #include "components/sync/protocol/sync.pb.h" |
| 40 #include "components/url_formatter/url_fixer.h" | 40 #include "components/url_formatter/url_fixer.h" |
| 41 #include "components/url_formatter/url_formatter.h" | 41 #include "components/url_formatter/url_formatter.h" |
| 42 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" | 42 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
| 43 #include "url/gurl.h" | 43 #include "url/gurl.h" |
| 44 | 44 |
| 45 typedef SearchHostToURLsMap::TemplateURLSet TemplateURLSet; | 45 typedef SearchHostToURLsMap::TemplateURLSet TemplateURLSet; |
| 46 typedef TemplateURLService::SyncDataMap SyncDataMap; | 46 typedef TemplateURLService::SyncDataMap SyncDataMap; |
| 47 | 47 |
| (...skipping 2426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2474 | 2474 |
| 2475 if (most_recently_intalled_default) { | 2475 if (most_recently_intalled_default) { |
| 2476 base::AutoReset<DefaultSearchChangeOrigin> change_origin( | 2476 base::AutoReset<DefaultSearchChangeOrigin> change_origin( |
| 2477 &dsp_change_origin_, DSP_CHANGE_OVERRIDE_SETTINGS_EXTENSION); | 2477 &dsp_change_origin_, DSP_CHANGE_OVERRIDE_SETTINGS_EXTENSION); |
| 2478 default_search_manager_.SetExtensionControlledDefaultSearchEngine( | 2478 default_search_manager_.SetExtensionControlledDefaultSearchEngine( |
| 2479 most_recently_intalled_default->data()); | 2479 most_recently_intalled_default->data()); |
| 2480 } else { | 2480 } else { |
| 2481 default_search_manager_.ClearExtensionControlledDefaultSearchEngine(); | 2481 default_search_manager_.ClearExtensionControlledDefaultSearchEngine(); |
| 2482 } | 2482 } |
| 2483 } | 2483 } |
| OLD | NEW |