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

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

Issue 333193002: Adding a SW reporter component updater (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merged to ToT. Created 6 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 | Annotate | Revision Log
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/profile_resetter.h" 5 #include "chrome/browser/profile_resetter/profile_resetter.h"
6 6
7 #include <string>
8
7 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
8 #include "base/prefs/scoped_user_pref_update.h" 10 #include "base/prefs/scoped_user_pref_update.h"
9 #include "base/synchronization/cancellation_flag.h" 11 #include "base/synchronization/cancellation_flag.h"
12 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/browsing_data/browsing_data_helper.h" 13 #include "chrome/browser/browsing_data/browsing_data_helper.h"
11 #include "chrome/browser/content_settings/host_content_settings_map.h" 14 #include "chrome/browser/content_settings/host_content_settings_map.h"
12 #include "chrome/browser/extensions/extension_service.h" 15 #include "chrome/browser/extensions/extension_service.h"
13 #include "chrome/browser/google/google_url_tracker_factory.h" 16 #include "chrome/browser/google/google_url_tracker_factory.h"
14 #include "chrome/browser/profile_resetter/brandcoded_default_settings.h" 17 #include "chrome/browser/profile_resetter/brandcoded_default_settings.h"
15 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 19 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
17 #include "chrome/browser/search_engines/template_url_service.h" 20 #include "chrome/browser/search_engines/template_url_service.h"
18 #include "chrome/browser/search_engines/template_url_service_factory.h" 21 #include "chrome/browser/search_engines/template_url_service_factory.h"
19 #include "chrome/browser/ui/browser.h" 22 #include "chrome/browser/ui/browser.h"
20 #include "chrome/browser/ui/browser_iterator.h" 23 #include "chrome/browser/ui/browser_iterator.h"
21 #include "chrome/browser/ui/tabs/tab_strip_model.h" 24 #include "chrome/browser/ui/tabs/tab_strip_model.h"
22 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
23 #include "chrome/installer/util/browser_distribution.h" 26 #include "chrome/installer/util/browser_distribution.h"
24 #include "components/google/core/browser/google_pref_names.h" 27 #include "components/google/core/browser/google_pref_names.h"
25 #include "components/google/core/browser/google_url_tracker.h" 28 #include "components/google/core/browser/google_url_tracker.h"
26 #include "content/public/browser/browser_thread.h" 29 #include "content/public/browser/browser_thread.h"
27 #include "extensions/browser/extension_system.h" 30 #include "extensions/browser/extension_system.h"
28 #include "extensions/browser/management_policy.h" 31 #include "extensions/browser/management_policy.h"
29 32
30 #if defined(OS_WIN) 33 #if defined(OS_WIN)
31 #include "base/base_paths.h" 34 #include "base/base_paths.h"
32 #include "base/path_service.h" 35 #include "base/path_service.h"
36 #include "chrome/browser/component_updater/sw_reporter_installer_win.h"
33 #include "chrome/installer/util/shell_util.h" 37 #include "chrome/installer/util/shell_util.h"
34 #include "content/public/browser/browser_thread.h"
35 38
36 namespace { 39 namespace {
37 40
38 void ResetShortcutsOnFileThread() { 41 void ResetShortcutsOnFileThread() {
39 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)); 42 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
40 // Get full path of chrome. 43 // Get full path of chrome.
41 base::FilePath chrome_exe; 44 base::FilePath chrome_exe;
42 if (!PathService::Get(base::FILE_EXE, &chrome_exe)) 45 if (!PathService::Get(base::FILE_EXE, &chrome_exe))
43 return; 46 return;
44 BrowserDistribution* dist = BrowserDistribution::GetSpecificDistribution( 47 BrowserDistribution* dist = BrowserDistribution::GetSpecificDistribution(
(...skipping 25 matching lines...) Expand all
70 } 73 }
71 74
72 ProfileResetter::~ProfileResetter() { 75 ProfileResetter::~ProfileResetter() {
73 if (cookies_remover_) 76 if (cookies_remover_)
74 cookies_remover_->RemoveObserver(this); 77 cookies_remover_->RemoveObserver(this);
75 } 78 }
76 79
77 void ProfileResetter::Reset( 80 void ProfileResetter::Reset(
78 ProfileResetter::ResettableFlags resettable_flags, 81 ProfileResetter::ResettableFlags resettable_flags,
79 scoped_ptr<BrandcodedDefaultSettings> master_settings, 82 scoped_ptr<BrandcodedDefaultSettings> master_settings,
83 bool accepted_send_feedback,
80 const base::Closure& callback) { 84 const base::Closure& callback) {
81 DCHECK(CalledOnValidThread()); 85 DCHECK(CalledOnValidThread());
82 DCHECK(master_settings); 86 DCHECK(master_settings);
83 87
84 // We should never be called with unknown flags. 88 // We should never be called with unknown flags.
85 CHECK_EQ(static_cast<ResettableFlags>(0), resettable_flags & ~ALL); 89 CHECK_EQ(static_cast<ResettableFlags>(0), resettable_flags & ~ALL);
86 90
87 // We should never be called when a previous reset has not finished. 91 // We should never be called when a previous reset has not finished.
88 CHECK_EQ(static_cast<ResettableFlags>(0), pending_reset_flags_); 92 CHECK_EQ(static_cast<ResettableFlags>(0), pending_reset_flags_);
89 93
90 if (!resettable_flags) { 94 if (!resettable_flags) {
91 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE, 95 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
92 callback); 96 callback);
93 return; 97 return;
94 } 98 }
95 99
96 master_settings_.swap(master_settings); 100 master_settings_.swap(master_settings);
97 callback_ = callback; 101 callback_ = callback;
98 102
99 // These flags are set to false by the individual reset functions. 103 // These flags are set to false by the individual reset functions.
100 pending_reset_flags_ = resettable_flags; 104 pending_reset_flags_ = resettable_flags;
101 105
102 struct { 106 struct {
103 Resettable flag; 107 Resettable flag;
104 void (ProfileResetter::*method)(); 108 void (ProfileResetter::*method)();
105 } flagToMethod [] = { 109 } flagToMethod[] = {
106 { DEFAULT_SEARCH_ENGINE, &ProfileResetter::ResetDefaultSearchEngine }, 110 {DEFAULT_SEARCH_ENGINE, &ProfileResetter::ResetDefaultSearchEngine},
107 { HOMEPAGE, &ProfileResetter::ResetHomepage }, 111 {HOMEPAGE, &ProfileResetter::ResetHomepage},
108 { CONTENT_SETTINGS, &ProfileResetter::ResetContentSettings }, 112 {CONTENT_SETTINGS, &ProfileResetter::ResetContentSettings},
109 { COOKIES_AND_SITE_DATA, &ProfileResetter::ResetCookiesAndSiteData }, 113 {COOKIES_AND_SITE_DATA, &ProfileResetter::ResetCookiesAndSiteData},
110 { EXTENSIONS, &ProfileResetter::ResetExtensions }, 114 {EXTENSIONS, &ProfileResetter::ResetExtensions},
111 { STARTUP_PAGES, &ProfileResetter::ResetStartupPages }, 115 {STARTUP_PAGES, &ProfileResetter::ResetStartupPages},
112 { PINNED_TABS, &ProfileResetter::ResetPinnedTabs }, 116 {PINNED_TABS, &ProfileResetter::ResetPinnedTabs},
113 { SHORTCUTS, &ProfileResetter::ResetShortcuts }, 117 {SHORTCUTS, &ProfileResetter::ResetShortcuts},
114 }; 118 };
115 119
116 ResettableFlags reset_triggered_for_flags = 0; 120 ResettableFlags reset_triggered_for_flags = 0;
117 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(flagToMethod); ++i) { 121 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(flagToMethod); ++i) {
118 if (resettable_flags & flagToMethod[i].flag) { 122 if (resettable_flags & flagToMethod[i].flag) {
119 reset_triggered_for_flags |= flagToMethod[i].flag; 123 reset_triggered_for_flags |= flagToMethod[i].flag;
120 (this->*flagToMethod[i].method)(); 124 (this->*flagToMethod[i].method)();
121 } 125 }
122 } 126 }
123 127
128 // When the user resets any of their settings on Windows and agreed to sending
129 // feedback, run the software reporter tool to see if it could find the reason
130 // why the user wanted a reset.
131 #if defined(OS_WIN)
132 // The browser process and / or local_state can be NULL when running tests.
133 if (accepted_send_feedback && g_browser_process &&
134 g_browser_process->local_state() &&
135 g_browser_process->local_state()->GetBoolean(
136 prefs::kMetricsReportingEnabled)) {
137 ExecuteSwReporter(g_browser_process->component_updater(),
138 g_browser_process->local_state());
139 }
140 #endif
141
124 DCHECK_EQ(resettable_flags, reset_triggered_for_flags); 142 DCHECK_EQ(resettable_flags, reset_triggered_for_flags);
125 } 143 }
126 144
127 bool ProfileResetter::IsActive() const { 145 bool ProfileResetter::IsActive() const {
128 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 146 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
129 return pending_reset_flags_ != 0; 147 return pending_reset_flags_ != 0;
130 } 148 }
131 149
132 void ProfileResetter::MarkAsDone(Resettable resettable) { 150 void ProfileResetter::MarkAsDone(Resettable resettable) {
133 DCHECK(CalledOnValidThread()); 151 DCHECK(CalledOnValidThread());
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 chrome_exe, 362 chrome_exe,
345 false, 363 false,
346 cancel, 364 cancel,
347 &shortcuts); 365 &shortcuts);
348 } 366 }
349 return shortcuts; 367 return shortcuts;
350 #else 368 #else
351 return std::vector<ShortcutCommand>(); 369 return std::vector<ShortcutCommand>();
352 #endif 370 #endif
353 } 371 }
OLDNEW
« no previous file with comments | « chrome/browser/profile_resetter/profile_resetter.h ('k') | chrome/browser/profile_resetter/profile_resetter_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698