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 "chrome/browser/profile_resetter/automatic_profile_resetter_delegate.h" | 5 #include "chrome/browser/profile_resetter/automatic_profile_resetter_delegate.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
11 #include "base/callback.h" | 11 #include "base/callback.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #include "base/md5.h" | 13 #include "base/md5.h" |
14 #include "base/memory/scoped_vector.h" | 14 #include "base/memory/scoped_vector.h" |
15 #include "base/strings/string_number_conversions.h" | 15 #include "base/strings/string_number_conversions.h" |
16 #include "base/strings/string_util.h" | 16 #include "base/strings/string_util.h" |
17 #include "base/values.h" | 17 #include "base/values.h" |
18 #include "chrome/app/chrome_command_ids.h" | 18 #include "chrome/app/chrome_command_ids.h" |
19 #include "chrome/browser/chrome_notification_types.h" | 19 #include "chrome/browser/chrome_notification_types.h" |
20 #include "chrome/browser/google/google_brand.h" | 20 #include "chrome/browser/google/google_brand.h" |
21 #include "chrome/browser/profile_resetter/brandcode_config_fetcher.h" | 21 #include "chrome/browser/profile_resetter/brandcode_config_fetcher.h" |
22 #include "chrome/browser/profile_resetter/profile_reset_global_error.h" | 22 #include "chrome/browser/profile_resetter/profile_reset_global_error.h" |
23 #include "chrome/browser/profile_resetter/profile_resetter.h" | 23 #include "chrome/browser/profile_resetter/profile_resetter.h" |
24 #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h" | 24 #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h" |
25 #include "chrome/browser/profiles/profile.h" | 25 #include "chrome/browser/profiles/profile.h" |
26 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | |
27 #include "chrome/browser/search_engines/template_url_service.h" | 26 #include "chrome/browser/search_engines/template_url_service.h" |
28 #include "chrome/browser/search_engines/template_url_service_factory.h" | 27 #include "chrome/browser/search_engines/template_url_service_factory.h" |
29 #include "chrome/browser/ui/browser.h" | 28 #include "chrome/browser/ui/browser.h" |
30 #include "chrome/browser/ui/browser_finder.h" | 29 #include "chrome/browser/ui/browser_finder.h" |
31 #include "chrome/browser/ui/global_error/global_error_service.h" | 30 #include "chrome/browser/ui/global_error/global_error_service.h" |
32 #include "chrome/browser/ui/global_error/global_error_service_factory.h" | 31 #include "chrome/browser/ui/global_error/global_error_service_factory.h" |
| 32 #include "components/search_engines/template_url_prepopulate_data.h" |
33 #include "content/public/browser/browser_thread.h" | 33 #include "content/public/browser/browser_thread.h" |
34 #include "content/public/browser/notification_service.h" | 34 #include "content/public/browser/notification_service.h" |
35 | 35 |
36 #if defined(OS_WIN) | 36 #if defined(OS_WIN) |
37 #include "chrome/browser/enumerate_modules_model_win.h" | 37 #include "chrome/browser/enumerate_modules_model_win.h" |
38 #endif | 38 #endif |
39 | 39 |
40 namespace { | 40 namespace { |
41 | 41 |
42 scoped_ptr<base::DictionaryValue> BuildSubTreeFromTemplateURL( | 42 scoped_ptr<base::DictionaryValue> BuildSubTreeFromTemplateURL( |
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
388 if (difference) { | 388 if (difference) { |
389 old_settings_snapshot->Subtract(new_settings_snapshot); | 389 old_settings_snapshot->Subtract(new_settings_snapshot); |
390 std::string report = | 390 std::string report = |
391 SerializeSettingsReport(*old_settings_snapshot, difference); | 391 SerializeSettingsReport(*old_settings_snapshot, difference); |
392 SendFeedback(report); | 392 SendFeedback(report); |
393 } | 393 } |
394 } | 394 } |
395 content::BrowserThread::PostTask( | 395 content::BrowserThread::PostTask( |
396 content::BrowserThread::UI, FROM_HERE, user_callback); | 396 content::BrowserThread::UI, FROM_HERE, user_callback); |
397 } | 397 } |
OLD | NEW |