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

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

Issue 2796783002: [Ext Registry] Do not try to re-watch registry if we are already watching it. (Closed)
Patch Set: revert retrying + add assert Created 3 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/extensions/external_registry_loader_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_BROWSER_EXTENSIONS_EXTERNAL_REGISTRY_LOADER_WIN_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_EXTERNAL_REGISTRY_LOADER_WIN_H_
6 #define CHROME_BROWSER_EXTENSIONS_EXTERNAL_REGISTRY_LOADER_WIN_H_ 6 #define CHROME_BROWSER_EXTENSIONS_EXTERNAL_REGISTRY_LOADER_WIN_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/win/registry.h" 10 #include "base/win/registry.h"
11 #include "chrome/browser/extensions/external_loader.h" 11 #include "chrome/browser/extensions/external_loader.h"
12 12
13 namespace extensions { 13 namespace extensions {
14 14
15 class ExternalRegistryLoader : public ExternalLoader { 15 class ExternalRegistryLoader : public ExternalLoader {
16 public: 16 public:
17 ExternalRegistryLoader() {} 17 ExternalRegistryLoader();
18 18
19 protected: 19 protected:
20 ~ExternalRegistryLoader() override {} // protected for unit test.
21
20 void StartLoading() override; 22 void StartLoading() override;
21 23
22 private: 24 private:
23 friend class base::RefCountedThreadSafe<ExternalLoader>; 25 friend class base::RefCountedThreadSafe<ExternalLoader>;
24 26
25 ~ExternalRegistryLoader() override {}
26
27 std::unique_ptr<base::DictionaryValue> LoadPrefsOnFileThread(); 27 std::unique_ptr<base::DictionaryValue> LoadPrefsOnFileThread();
28 void LoadOnFileThread(); 28 void LoadOnFileThread();
29 void CompleteLoadAndStartWatchingRegistry(); 29 void CompleteLoadAndStartWatchingRegistry();
30 void UpdatePrefsOnFileThread(); 30 void UpdatePrefsOnFileThread();
31 void OnRegistryKeyChanged(base::win::RegKey* key); 31 void OnRegistryKeyChanged(base::win::RegKey* key);
32 32
33 // Whether or not we attempted to observe registry.
34 bool attempted_watching_registry_;
35
33 base::win::RegKey hklm_key_; 36 base::win::RegKey hklm_key_;
34 base::win::RegKey hkcu_key_; 37 base::win::RegKey hkcu_key_;
35 38
36 DISALLOW_COPY_AND_ASSIGN(ExternalRegistryLoader); 39 DISALLOW_COPY_AND_ASSIGN(ExternalRegistryLoader);
37 }; 40 };
38 41
39 } // namespace extensions 42 } // namespace extensions
40 43
41 #endif // CHROME_BROWSER_EXTENSIONS_EXTERNAL_REGISTRY_LOADER_WIN_H_ 44 #endif // CHROME_BROWSER_EXTENSIONS_EXTERNAL_REGISTRY_LOADER_WIN_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/external_registry_loader_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698