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

Side by Side Diff: components/search_engines/template_url_service.h

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 years, 6 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 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 #ifndef COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_ 5 #ifndef COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
6 #define COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_ 6 #define COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 628 matching lines...) Expand 10 before | Expand all | Expand 10 after
639 PrefChangeRegistrar pref_change_registrar_; 639 PrefChangeRegistrar pref_change_registrar_;
640 640
641 // Mapping from keyword to the TemplateURL. 641 // Mapping from keyword to the TemplateURL.
642 KeywordToTemplateMap keyword_to_template_map_; 642 KeywordToTemplateMap keyword_to_template_map_;
643 643
644 // Mapping from Sync GUIDs to the TemplateURL. 644 // Mapping from Sync GUIDs to the TemplateURL.
645 GUIDToTemplateMap guid_to_template_map_; 645 GUIDToTemplateMap guid_to_template_map_;
646 646
647 TemplateURLVector template_urls_; 647 TemplateURLVector template_urls_;
648 648
649 ObserverList<TemplateURLServiceObserver> model_observers_; 649 base::ObserverList<TemplateURLServiceObserver> model_observers_;
650 650
651 // Maps from host to set of TemplateURLs whose search url host is host. 651 // Maps from host to set of TemplateURLs whose search url host is host.
652 // NOTE: This is always non-NULL; we use a scoped_ptr<> to avoid circular 652 // NOTE: This is always non-NULL; we use a scoped_ptr<> to avoid circular
653 // header dependencies. 653 // header dependencies.
654 scoped_ptr<SearchHostToURLsMap> provider_map_; 654 scoped_ptr<SearchHostToURLsMap> provider_map_;
655 655
656 // Whether the keywords have been loaded. 656 // Whether the keywords have been loaded.
657 bool loaded_; 657 bool loaded_;
658 658
659 // Set when the web data service fails to load properly. This prevents 659 // Set when the web data service fails to load properly. This prevents
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 719
720 // Helper class to manage the default search engine. 720 // Helper class to manage the default search engine.
721 DefaultSearchManager default_search_manager_; 721 DefaultSearchManager default_search_manager_;
722 722
723 scoped_ptr<GoogleURLTracker::Subscription> google_url_updated_subscription_; 723 scoped_ptr<GoogleURLTracker::Subscription> google_url_updated_subscription_;
724 724
725 DISALLOW_COPY_AND_ASSIGN(TemplateURLService); 725 DISALLOW_COPY_AND_ASSIGN(TemplateURLService);
726 }; 726 };
727 727
728 #endif // COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_ 728 #endif // COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
OLDNEW
« no previous file with comments | « components/renderer_context_menu/render_view_context_menu_base.h ('k') | components/search_provider_logos/logo_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698