chrome/browser/search_engines/template_url_service.cc - Issue 8558020: Protector strings and bubble/SettingsChange code refactoring.

Side by Side Diff: chrome/browser/search_engines/template_url_service.cc

Issue 8558020: Protector strings and bubble/SettingsChange code refactoring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: This time it really should compile. Created 9 years, 1 month 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/protector/settings_change_global_error_delegate.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "chrome/browser/search_engines/template_url_service.h"	5 #include "chrome/browser/search_engines/template_url_service.h"

6	6

7 #include "base/auto_reset.h"	7 #include "base/auto_reset.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "base/environment.h"	9 #include "base/environment.h"

10 #include "base/i18n/case_conversion.h"	10 #include "base/i18n/case_conversion.h"

11 #include "base/stl_util.h"	11 #include "base/stl_util.h"

12 #include "base/string_number_conversions.h"	12 #include "base/string_number_conversions.h"

13 #include "base/string_split.h"	13 #include "base/string_split.h"

14 #include "base/string_util.h"	14 #include "base/string_util.h"

15 #include "base/threading/thread_restrictions.h"	15 #include "base/threading/thread_restrictions.h"

16 #include "base/utf_string_conversions.h"	16 #include "base/utf_string_conversions.h"

17 #include "chrome/browser/extensions/extension_service.h"	17 #include "chrome/browser/extensions/extension_service.h"

18 #include "chrome/browser/google/google_url_tracker.h"	18 #include "chrome/browser/google/google_url_tracker.h"

19 #include "chrome/browser/history/history.h"	19 #include "chrome/browser/history/history.h"

20 #include "chrome/browser/history/history_notifications.h"	20 #include "chrome/browser/history/history_notifications.h"

21 #include "chrome/browser/net/url_fixer_upper.h"	21 #include "chrome/browser/net/url_fixer_upper.h"

22 #include "chrome/browser/prefs/pref_service.h"	22 #include "chrome/browser/prefs/pref_service.h"

23 #include "chrome/browser/prefs/pref_set_observer.h"	23 #include "chrome/browser/prefs/pref_set_observer.h"

24 #include "chrome/browser/profiles/profile.h"	24 #include "chrome/browser/profiles/profile.h"

	25 #include "chrome/browser/protector/base_setting_change.h"

25 #include "chrome/browser/protector/protector.h"	26 #include "chrome/browser/protector/protector.h"

26 #include "chrome/browser/protector/setting_change.h"

27 #include "chrome/browser/rlz/rlz.h"	27 #include "chrome/browser/rlz/rlz.h"

28 #include "chrome/browser/search_engines/search_host_to_urls_map.h"	28 #include "chrome/browser/search_engines/search_host_to_urls_map.h"

29 #include "chrome/browser/search_engines/search_terms_data.h"	29 #include "chrome/browser/search_engines/search_terms_data.h"

30 #include "chrome/browser/search_engines/template_url.h"	30 #include "chrome/browser/search_engines/template_url.h"

31 #include "chrome/browser/search_engines/template_url_service_observer.h"	31 #include "chrome/browser/search_engines/template_url_service_observer.h"

32 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"	32 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"

33 #include "chrome/browser/search_engines/util.h"	33 #include "chrome/browser/search_engines/util.h"

34 #include "chrome/browser/sync/api/sync_change.h"	34 #include "chrome/browser/sync/api/sync_change.h"

35 #include "chrome/browser/sync/protocol/search_engine_specifics.pb.h"	35 #include "chrome/browser/sync/protocol/search_engine_specifics.pb.h"

36 #include "chrome/common/chrome_notification_types.h"	36 #include "chrome/common/chrome_notification_types.h"

(...skipping 1821 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1858 i != template_urls->end(); ++i) {	1858 i != template_urls->end(); ++i) {

1859 TemplateURL* template_url = *i;	1859 TemplateURL* template_url = *i;

1860 DCHECK(template_url);	1860 DCHECK(template_url);

1861 if (template_url->sync_guid().empty()) {	1861 if (template_url->sync_guid().empty()) {

1862 template_url->set_sync_guid(guid::GenerateGUID());	1862 template_url->set_sync_guid(guid::GenerateGUID());

1863 if (service_.get())	1863 if (service_.get())

1864 service_->UpdateKeyword(*template_url);	1864 service_->UpdateKeyword(*template_url);

1865 }	1865 }

1866 }	1866 }

1867 }	1867 }

OLD	NEW