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

Side by Side Diff: chrome/browser/extensions/external_registry_loader_win.cc

Issue 1495403002: Observe adding external extensions via windows registry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sync @tott Created 4 years, 11 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/extensions/external_registry_loader_win.h" 5 #include "chrome/browser/extensions/external_registry_loader_win.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/files/scoped_file.h" 10 #include "base/files/scoped_file.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 namespace extensions { 55 namespace extensions {
56 56
57 void ExternalRegistryLoader::StartLoading() { 57 void ExternalRegistryLoader::StartLoading() {
58 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 58 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
59 BrowserThread::PostTask( 59 BrowserThread::PostTask(
60 BrowserThread::FILE, FROM_HERE, 60 BrowserThread::FILE, FROM_HERE,
61 base::Bind(&ExternalRegistryLoader::LoadOnFileThread, this)); 61 base::Bind(&ExternalRegistryLoader::LoadOnFileThread, this));
62 } 62 }
63 63
64 void ExternalRegistryLoader::LoadOnFileThread() { 64 scoped_ptr<base::DictionaryValue>
65 ExternalRegistryLoader::LoadPrefsOnFileThread() {
65 CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); 66 CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
66 base::TimeTicks start_time = base::TimeTicks::Now();
67 scoped_ptr<base::DictionaryValue> prefs(new base::DictionaryValue); 67 scoped_ptr<base::DictionaryValue> prefs(new base::DictionaryValue);
68 68
69 // A map of IDs, to weed out duplicates between HKCU and HKLM. 69 // A map of IDs, to weed out duplicates between HKCU and HKLM.
70 std::set<base::string16> keys; 70 std::set<base::string16> keys;
71 base::win::RegistryKeyIterator iterator_machine_key( 71 base::win::RegistryKeyIterator iterator_machine_key(
72 HKEY_LOCAL_MACHINE, 72 HKEY_LOCAL_MACHINE,
73 kRegistryExtensions, 73 kRegistryExtensions,
74 KEY_WOW64_32KEY); 74 KEY_WOW64_32KEY);
75 for (; iterator_machine_key.Valid(); ++iterator_machine_key) 75 for (; iterator_machine_key.Valid(); ++iterator_machine_key)
76 keys.insert(iterator_machine_key.Name()); 76 keys.insert(iterator_machine_key.Name());
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 MakePrefName(id, ExternalProviderImpl::kExternalVersion), 175 MakePrefName(id, ExternalProviderImpl::kExternalVersion),
176 base::UTF16ToASCII(extension_version)); 176 base::UTF16ToASCII(extension_version));
177 prefs->SetString( 177 prefs->SetString(
178 MakePrefName(id, ExternalProviderImpl::kExternalCrx), 178 MakePrefName(id, ExternalProviderImpl::kExternalCrx),
179 extension_path_str); 179 extension_path_str);
180 prefs->SetBoolean( 180 prefs->SetBoolean(
181 MakePrefName(id, ExternalProviderImpl::kMayBeUntrusted), 181 MakePrefName(id, ExternalProviderImpl::kMayBeUntrusted),
182 true); 182 true);
183 } 183 }
184 184
185 prefs_.reset(prefs.release()); 185 return prefs;
186 }
187
188 void ExternalRegistryLoader::LoadOnFileThread() {
189 base::TimeTicks start_time = base::TimeTicks::Now();
190 scoped_ptr<base::DictionaryValue> initial_prefs = LoadPrefsOnFileThread();
191 prefs_.reset(initial_prefs.release());
186 LOCAL_HISTOGRAM_TIMES("Extensions.ExternalRegistryLoaderWin", 192 LOCAL_HISTOGRAM_TIMES("Extensions.ExternalRegistryLoaderWin",
187 base::TimeTicks::Now() - start_time); 193 base::TimeTicks::Now() - start_time);
188 BrowserThread::PostTask( 194 BrowserThread::PostTask(
189 BrowserThread::UI, FROM_HERE, 195 BrowserThread::UI, FROM_HERE,
190 base::Bind(&ExternalRegistryLoader::LoadFinished, this)); 196 base::Bind(&ExternalRegistryLoader::CompleteLoadAndStartWatchingRegistry,
197 this));
198 }
199
200 void ExternalRegistryLoader::CompleteLoadAndStartWatchingRegistry() {
201 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
202 LoadFinished();
203
204 // Start watching registry.
205 if (hklm_key_.Create(HKEY_LOCAL_MACHINE, kRegistryExtensions,
206 KEY_NOTIFY | KEY_WOW64_32KEY) == ERROR_SUCCESS) {
207 base::win::RegKey::ChangeCallback callback =
208 base::Bind(&ExternalRegistryLoader::OnRegistryKeyChanged,
209 base::Unretained(this), base::Unretained(&hklm_key_));
210 hklm_key_.StartWatching(callback);
211 } else {
212 LOG(WARNING) << "Error observing HKLM.";
213 }
214
215 if (hkcu_key_.Create(HKEY_CURRENT_USER, kRegistryExtensions, KEY_NOTIFY) ==
216 ERROR_SUCCESS) {
217 base::win::RegKey::ChangeCallback callback =
218 base::Bind(&ExternalRegistryLoader::OnRegistryKeyChanged,
219 base::Unretained(this), base::Unretained(&hkcu_key_));
220 hkcu_key_.StartWatching(callback);
221 } else {
222 LOG(WARNING) << "Error observing HKCU.";
223 }
224 }
225
226 void ExternalRegistryLoader::OnRegistryKeyChanged(base::win::RegKey* key) {
227 // |OnRegistryKeyChanged| is removed as an observer when the ChangeCallback is
228 // called, so we need to re-register.
229 key->StartWatching(base::Bind(&ExternalRegistryLoader::OnRegistryKeyChanged,
230 base::Unretained(this), base::Unretained(key)));
231
232 BrowserThread::PostTask(
233 BrowserThread::FILE, FROM_HERE,
234 base::Bind(&ExternalRegistryLoader::UpdatePrefsOnFileThread, this));
235 }
236
237 void ExternalRegistryLoader::UpdatePrefsOnFileThread() {
238 CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
239 base::TimeTicks start_time = base::TimeTicks::Now();
240 scoped_ptr<base::DictionaryValue> prefs = LoadPrefsOnFileThread();
241 LOCAL_HISTOGRAM_TIMES("Extensions.ExternalRegistryLoaderWinUpdate",
242 base::TimeTicks::Now() - start_time);
243 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
244 base::Bind(&ExternalRegistryLoader::OnUpdated, this,
245 base::Passed(&prefs)));
191 } 246 }
192 247
193 } // namespace extensions 248 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/external_registry_loader_win.h ('k') | extensions/browser/external_install_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698