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

Unified Diff: chrome/browser/extensions/extension_tab_helper.h

Issue 10754004: Remove the refcount from ScriptBadgeController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert ScopedObserver Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_tab_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_tab_helper.h
diff --git a/chrome/browser/extensions/extension_tab_helper.h b/chrome/browser/extensions/extension_tab_helper.h
index 222c24f63f806abca7ca8eb70e004e0f780de09a..00e07e4a71b6d99a9fad041662d4ea24c77bfd96 100644
--- a/chrome/browser/extensions/extension_tab_helper.h
+++ b/chrome/browser/extensions/extension_tab_helper.h
@@ -111,9 +111,13 @@ class ExtensionTabHelper
return content::WebContentsObserver::web_contents();
}
- extensions::ScriptExecutor* script_executor();
+ extensions::ScriptExecutor* script_executor() {
+ return script_executor_.get();
+ }
- extensions::LocationBarController* location_bar_controller();
+ extensions::LocationBarController* location_bar_controller() {
+ return location_bar_controller_.get();
+ }
extensions::ActiveTabPermissionManager* active_tab_permission_manager() {
return &active_tab_permission_manager_;
@@ -221,12 +225,9 @@ class ExtensionTabHelper
TabContents* tab_contents_;
- // Either script_executor/location_bar_controller will have values, or
- // script_badge_controller will have a value, depending on whether the action
- // box is turned on.
scoped_ptr<extensions::ScriptExecutor> script_executor_;
+
scoped_ptr<extensions::LocationBarController> location_bar_controller_;
- scoped_refptr<extensions::ScriptBadgeController> script_badge_controller_;
extensions::ActiveTabPermissionManager active_tab_permission_manager_;
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698