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

Unified Diff: extensions/browser/api/declarative/rules_registry.cc

Issue 744663002: Fix WeakPtrFactory member ordering in extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: extensions/browser/api/declarative/rules_registry.cc
diff --git a/extensions/browser/api/declarative/rules_registry.cc b/extensions/browser/api/declarative/rules_registry.cc
index ececdfdaa85cda66bbf7f600c0926cc6c78c8487..6e4df21bc4f082918c8d5e1ec2d5e53ba8215c23 100644
--- a/extensions/browser/api/declarative/rules_registry.cc
+++ b/extensions/browser/api/declarative/rules_registry.cc
@@ -69,19 +69,17 @@ namespace extensions {
// RulesRegistry
-RulesRegistry::RulesRegistry(content::BrowserContext* browser_context,
- const std::string& event_name,
+RulesRegistry::RulesRegistry(content::BrowserContext *browser_context,
not at google - send to devlin 2014/11/20 15:30:30 Please don't arbitrarily change style like this. B
MRV 2014/11/21 11:12:39 @Kalman, while uploading patch using "git cl uploa
+ const std::string &event_name,
content::BrowserThread::ID owner_thread,
- RulesCacheDelegate* cache_delegate,
- const WebViewKey& webview_key)
- : browser_context_(browser_context),
- owner_thread_(owner_thread),
- event_name_(event_name),
- webview_key_(webview_key),
- ready_(/*signaled=*/!cache_delegate), // Immediately ready if no cache
- // delegate to wait for.
- weak_ptr_factory_(browser_context_ ? this : NULL),
- last_generated_rule_identifier_id_(0) {
+ RulesCacheDelegate *cache_delegate,
+ const WebViewKey &webview_key)
+ : browser_context_(browser_context), owner_thread_(owner_thread),
+ event_name_(event_name), webview_key_(webview_key),
+ ready_(/*signaled=*/!cache_delegate), // Immediately ready if no cache
+ // delegate to wait for.
+ last_generated_rule_identifier_id_(0),
+ weak_ptr_factory_(browser_context_ ? this : NULL) {
if (cache_delegate) {
cache_delegate_ = cache_delegate->GetWeakPtr();
cache_delegate->Init(this);

Powered by Google App Engine
This is Rietveld 408576698