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

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

Issue 362343006: Fix dangerous pointer use in UserScriptMaster (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_EXTENSION_SYSTEM_IMPL_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_IMPL_H_
6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_IMPL_H_ 6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_IMPL_H_
7 7
8 #include "extensions/browser/extension_system.h" 8 #include "extensions/browser/extension_system.h"
9 #include "extensions/common/one_shot_event.h" 9 #include "extensions/common/one_shot_event.h"
10 10
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 103
104 // The services that are shared between normal and incognito profiles. 104 // The services that are shared between normal and incognito profiles.
105 105
106 scoped_ptr<StateStore> state_store_; 106 scoped_ptr<StateStore> state_store_;
107 scoped_ptr<StateStore> rules_store_; 107 scoped_ptr<StateStore> rules_store_;
108 // LazyBackgroundTaskQueue is a dependency of 108 // LazyBackgroundTaskQueue is a dependency of
109 // MessageService and EventRouter. 109 // MessageService and EventRouter.
110 scoped_ptr<LazyBackgroundTaskQueue> lazy_background_task_queue_; 110 scoped_ptr<LazyBackgroundTaskQueue> lazy_background_task_queue_;
111 scoped_ptr<EventRouter> event_router_; 111 scoped_ptr<EventRouter> event_router_;
112 scoped_ptr<NavigationObserver> navigation_observer_; 112 scoped_ptr<NavigationObserver> navigation_observer_;
113 scoped_refptr<UserScriptMaster> user_script_master_; 113 scoped_ptr<UserScriptMaster> user_script_master_;
114 scoped_ptr<Blacklist> blacklist_; 114 scoped_ptr<Blacklist> blacklist_;
115 // StandardManagementPolicyProvider depends on Blacklist. 115 // StandardManagementPolicyProvider depends on Blacklist.
116 scoped_ptr<StandardManagementPolicyProvider> 116 scoped_ptr<StandardManagementPolicyProvider>
117 standard_management_policy_provider_; 117 standard_management_policy_provider_;
118 scoped_ptr<RuntimeData> runtime_data_; 118 scoped_ptr<RuntimeData> runtime_data_;
119 // ExtensionService depends on StateStore, Blacklist and RuntimeData. 119 // ExtensionService depends on StateStore, Blacklist and RuntimeData.
120 scoped_ptr<ExtensionService> extension_service_; 120 scoped_ptr<ExtensionService> extension_service_;
121 scoped_ptr<ManagementPolicy> management_policy_; 121 scoped_ptr<ManagementPolicy> management_policy_;
122 // extension_info_map_ needs to outlive process_manager_. 122 // extension_info_map_ needs to outlive process_manager_.
123 scoped_refptr<InfoMap> extension_info_map_; 123 scoped_refptr<InfoMap> extension_info_map_;
(...skipping 23 matching lines...) Expand all
147 // extension processes and those require access to the ResourceContext owned 147 // extension processes and those require access to the ResourceContext owned
148 // by |io_data_|. 148 // by |io_data_|.
149 scoped_ptr<ProcessManager> process_manager_; 149 scoped_ptr<ProcessManager> process_manager_;
150 150
151 DISALLOW_COPY_AND_ASSIGN(ExtensionSystemImpl); 151 DISALLOW_COPY_AND_ASSIGN(ExtensionSystemImpl);
152 }; 152 };
153 153
154 } // namespace extensions 154 } // namespace extensions
155 155
156 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_IMPL_H_ 156 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698