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

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

Issue 16087006: Revert "Revert 202751 "Change RulesRegistryService to use ProfileKeyedAPI."" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
« no previous file with comments | « chrome/browser/extensions/extension_system.cc ('k') | chrome/browser/extensions/tab_helper.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_TAB_HELPER_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
6 #define CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_ 6 #define CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 content::NotificationRegistrar registrar_; 247 content::NotificationRegistrar registrar_;
248 248
249 scoped_ptr<ScriptExecutor> script_executor_; 249 scoped_ptr<ScriptExecutor> script_executor_;
250 250
251 scoped_ptr<LocationBarController> location_bar_controller_; 251 scoped_ptr<LocationBarController> location_bar_controller_;
252 252
253 scoped_ptr<ActiveTabPermissionGranter> active_tab_permission_granter_; 253 scoped_ptr<ActiveTabPermissionGranter> active_tab_permission_granter_;
254 254
255 scoped_ptr<ScriptBubbleController> script_bubble_controller_; 255 scoped_ptr<ScriptBubbleController> script_bubble_controller_;
256 256
257 RulesRegistryService* rules_registry_service_;
258
259 Profile* profile_; 257 Profile* profile_;
260 258
261 // Vend weak pointers that can be invalidated to stop in-progress loads. 259 // Vend weak pointers that can be invalidated to stop in-progress loads.
262 base::WeakPtrFactory<TabHelper> image_loader_ptr_factory_; 260 base::WeakPtrFactory<TabHelper> image_loader_ptr_factory_;
263 261
264 DISALLOW_COPY_AND_ASSIGN(TabHelper); 262 DISALLOW_COPY_AND_ASSIGN(TabHelper);
265 }; 263 };
266 264
267 } // namespace extensions 265 } // namespace extensions
268 266
269 #endif // CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_ 267 #endif // CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_system.cc ('k') | chrome/browser/extensions/tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698