OLD | NEW |
---|---|
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/profile_resetter.h" | 5 #include "chrome/browser/profile_resetter/profile_resetter.h" |
6 | 6 |
7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
8 #include "base/prefs/scoped_user_pref_update.h" | 8 #include "base/prefs/scoped_user_pref_update.h" |
9 #include "base/synchronization/cancellation_flag.h" | 9 #include "base/synchronization/cancellation_flag.h" |
10 #include "chrome/browser/browser_process.h" | |
10 #include "chrome/browser/browsing_data/browsing_data_helper.h" | 11 #include "chrome/browser/browsing_data/browsing_data_helper.h" |
11 #include "chrome/browser/content_settings/host_content_settings_map.h" | 12 #include "chrome/browser/content_settings/host_content_settings_map.h" |
12 #include "chrome/browser/extensions/extension_service.h" | 13 #include "chrome/browser/extensions/extension_service.h" |
13 #include "chrome/browser/google/google_url_tracker_factory.h" | 14 #include "chrome/browser/google/google_url_tracker_factory.h" |
14 #include "chrome/browser/profile_resetter/brandcoded_default_settings.h" | 15 #include "chrome/browser/profile_resetter/brandcoded_default_settings.h" |
15 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 17 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
17 #include "chrome/browser/search_engines/template_url_service.h" | 18 #include "chrome/browser/search_engines/template_url_service.h" |
18 #include "chrome/browser/search_engines/template_url_service_factory.h" | 19 #include "chrome/browser/search_engines/template_url_service_factory.h" |
19 #include "chrome/browser/ui/browser.h" | 20 #include "chrome/browser/ui/browser.h" |
20 #include "chrome/browser/ui/browser_iterator.h" | 21 #include "chrome/browser/ui/browser_iterator.h" |
21 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 22 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
22 #include "chrome/common/pref_names.h" | 23 #include "chrome/common/pref_names.h" |
23 #include "chrome/installer/util/browser_distribution.h" | 24 #include "chrome/installer/util/browser_distribution.h" |
24 #include "components/google/core/browser/google_pref_names.h" | 25 #include "components/google/core/browser/google_pref_names.h" |
25 #include "components/google/core/browser/google_url_tracker.h" | 26 #include "components/google/core/browser/google_url_tracker.h" |
26 #include "content/public/browser/browser_thread.h" | 27 #include "content/public/browser/browser_thread.h" |
27 #include "extensions/browser/extension_system.h" | 28 #include "extensions/browser/extension_system.h" |
28 #include "extensions/browser/management_policy.h" | 29 #include "extensions/browser/management_policy.h" |
29 | 30 |
30 #if defined(OS_WIN) | 31 #if defined(OS_WIN) |
31 #include "base/base_paths.h" | 32 #include "base/base_paths.h" |
32 #include "base/path_service.h" | 33 #include "base/path_service.h" |
34 #include "chrome/browser/component_updater/sw_reporter_component_installer_win.h " | |
33 #include "chrome/installer/util/shell_util.h" | 35 #include "chrome/installer/util/shell_util.h" |
34 #include "content/public/browser/browser_thread.h" | 36 #include "content/public/browser/browser_thread.h" |
35 | 37 |
36 namespace { | 38 namespace { |
37 | 39 |
38 void ResetShortcutsOnFileThread() { | 40 void ResetShortcutsOnFileThread() { |
39 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)); | 41 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)); |
40 // Get full path of chrome. | 42 // Get full path of chrome. |
41 base::FilePath chrome_exe; | 43 base::FilePath chrome_exe; |
42 if (!PathService::Get(base::FILE_EXE, &chrome_exe)) | 44 if (!PathService::Get(base::FILE_EXE, &chrome_exe)) |
(...skipping 27 matching lines...) Expand all Loading... | |
70 } | 72 } |
71 | 73 |
72 ProfileResetter::~ProfileResetter() { | 74 ProfileResetter::~ProfileResetter() { |
73 if (cookies_remover_) | 75 if (cookies_remover_) |
74 cookies_remover_->RemoveObserver(this); | 76 cookies_remover_->RemoveObserver(this); |
75 } | 77 } |
76 | 78 |
77 void ProfileResetter::Reset( | 79 void ProfileResetter::Reset( |
78 ProfileResetter::ResettableFlags resettable_flags, | 80 ProfileResetter::ResettableFlags resettable_flags, |
79 scoped_ptr<BrandcodedDefaultSettings> master_settings, | 81 scoped_ptr<BrandcodedDefaultSettings> master_settings, |
82 bool accepted_send_feedback, | |
80 const base::Closure& callback) { | 83 const base::Closure& callback) { |
81 DCHECK(CalledOnValidThread()); | 84 DCHECK(CalledOnValidThread()); |
82 DCHECK(master_settings); | 85 DCHECK(master_settings); |
83 | 86 |
84 // We should never be called with unknown flags. | 87 // We should never be called with unknown flags. |
85 CHECK_EQ(static_cast<ResettableFlags>(0), resettable_flags & ~ALL); | 88 CHECK_EQ(static_cast<ResettableFlags>(0), resettable_flags & ~ALL); |
86 | 89 |
87 // We should never be called when a previous reset has not finished. | 90 // We should never be called when a previous reset has not finished. |
88 CHECK_EQ(static_cast<ResettableFlags>(0), pending_reset_flags_); | 91 CHECK_EQ(static_cast<ResettableFlags>(0), pending_reset_flags_); |
89 | 92 |
(...skipping 24 matching lines...) Expand all Loading... | |
114 }; | 117 }; |
115 | 118 |
116 ResettableFlags reset_triggered_for_flags = 0; | 119 ResettableFlags reset_triggered_for_flags = 0; |
117 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(flagToMethod); ++i) { | 120 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(flagToMethod); ++i) { |
118 if (resettable_flags & flagToMethod[i].flag) { | 121 if (resettable_flags & flagToMethod[i].flag) { |
119 reset_triggered_for_flags |= flagToMethod[i].flag; | 122 reset_triggered_for_flags |= flagToMethod[i].flag; |
120 (this->*flagToMethod[i].method)(); | 123 (this->*flagToMethod[i].method)(); |
121 } | 124 } |
122 } | 125 } |
123 | 126 |
127 // When the user resets any of their settings on Windows, run the software | |
battre
2014/06/17 15:09:46
... on Windows and agreed to sending feedback
MAD
2014/06/17 15:26:31
Done.
| |
128 // reporter tool to see if it could find the reason why the user wanted a | |
129 // reset. | |
battre
2014/06/17 15:09:46
nit: +1 space
MAD
2014/06/17 15:26:31
Where? At the beginning of the comments before the
| |
130 #if defined(OS_WIN) | |
131 // The browser process and / or local_state can be NULL when running tests. | |
132 if (accepted_send_feedback && g_browser_process && | |
133 g_browser_process->local_state() && | |
134 g_browser_process->local_state()->GetBoolean( | |
135 prefs::kMetricsReportingEnabled)) { | |
136 RegisterSwReporterComponent(g_browser_process->component_updater(), | |
137 g_browser_process->local_state()); | |
138 } | |
139 #endif | |
140 | |
124 DCHECK_EQ(resettable_flags, reset_triggered_for_flags); | 141 DCHECK_EQ(resettable_flags, reset_triggered_for_flags); |
125 } | 142 } |
126 | 143 |
127 bool ProfileResetter::IsActive() const { | 144 bool ProfileResetter::IsActive() const { |
128 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); | 145 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); |
129 return pending_reset_flags_ != 0; | 146 return pending_reset_flags_ != 0; |
130 } | 147 } |
131 | 148 |
132 void ProfileResetter::MarkAsDone(Resettable resettable) { | 149 void ProfileResetter::MarkAsDone(Resettable resettable) { |
133 DCHECK(CalledOnValidThread()); | 150 DCHECK(CalledOnValidThread()); |
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
344 chrome_exe, | 361 chrome_exe, |
345 false, | 362 false, |
346 cancel, | 363 cancel, |
347 &shortcuts); | 364 &shortcuts); |
348 } | 365 } |
349 return shortcuts; | 366 return shortcuts; |
350 #else | 367 #else |
351 return std::vector<ShortcutCommand>(); | 368 return std::vector<ShortcutCommand>(); |
352 #endif | 369 #endif |
353 } | 370 } |
OLD | NEW |