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

Side by Side Diff: chrome/browser/profile_resetter/resettable_settings_snapshot.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/resettable_settings_snapshot.h" 5 #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h"
6 6
7 #include "base/guid.h" 7 #include "base/guid.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "base/md5.h" 9 #include "base/md5.h"
10 #include "base/prefs/pref_service.h"
11 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
12 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
13 #include "base/synchronization/cancellation_flag.h" 12 #include "base/synchronization/cancellation_flag.h"
14 #include "base/values.h" 13 #include "base/values.h"
15 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
16 #include "chrome/browser/profile_resetter/profile_reset_report.pb.h" 15 #include "chrome/browser/profile_resetter/profile_reset_report.pb.h"
17 #include "chrome/browser/profile_resetter/reset_report_uploader.h" 16 #include "chrome/browser/profile_resetter/reset_report_uploader.h"
18 #include "chrome/browser/profile_resetter/reset_report_uploader_factory.h" 17 #include "chrome/browser/profile_resetter/reset_report_uploader_factory.h"
19 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/browser/search_engines/template_url_service_factory.h" 19 #include "chrome/browser/search_engines/template_url_service_factory.h"
21 #include "chrome/common/channel_info.h" 20 #include "chrome/common/channel_info.h"
22 #include "chrome/common/chrome_content_client.h" 21 #include "chrome/common/chrome_content_client.h"
23 #include "chrome/common/pref_names.h" 22 #include "chrome/common/pref_names.h"
24 #include "chrome/grit/chromium_strings.h" 23 #include "chrome/grit/chromium_strings.h"
25 #include "chrome/grit/generated_resources.h" 24 #include "chrome/grit/generated_resources.h"
26 #include "components/feedback/feedback_data.h" 25 #include "components/feedback/feedback_data.h"
27 #include "components/feedback/feedback_util.h" 26 #include "components/feedback/feedback_util.h"
27 #include "components/prefs/pref_service.h"
28 #include "components/search_engines/template_url_service.h" 28 #include "components/search_engines/template_url_service.h"
29 #include "components/version_info/version_info.h" 29 #include "components/version_info/version_info.h"
30 #include "content/public/browser/browser_thread.h" 30 #include "content/public/browser/browser_thread.h"
31 #include "extensions/browser/extension_registry.h" 31 #include "extensions/browser/extension_registry.h"
32 #include "grit/components_strings.h" 32 #include "grit/components_strings.h"
33 #include "ui/base/l10n/l10n_util.h" 33 #include "ui/base/l10n/l10n_util.h"
34 34
35 using feedback::FeedbackData; 35 using feedback::FeedbackData;
36 36
37 namespace { 37 namespace {
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 extension_names += '\n'; 423 extension_names += '\n';
424 extension_names += i->second; 424 extension_names += i->second;
425 } 425 }
426 if (!extension_names.empty()) { 426 if (!extension_names.empty()) {
427 AddPair(list.get(), 427 AddPair(list.get(),
428 l10n_util::GetStringUTF16(IDS_RESET_PROFILE_SETTINGS_EXTENSIONS), 428 l10n_util::GetStringUTF16(IDS_RESET_PROFILE_SETTINGS_EXTENSIONS),
429 extension_names); 429 extension_names);
430 } 430 }
431 return list; 431 return list;
432 } 432 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698