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

Unified Diff: chrome/browser/ui/tab_contents/tab_contents_wrapper.h

Issue 10392142: Revert 137630 - Broke ASAN (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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
Index: chrome/browser/ui/tab_contents/tab_contents_wrapper.h
===================================================================
--- chrome/browser/ui/tab_contents/tab_contents_wrapper.h (revision 137631)
+++ chrome/browser/ui/tab_contents/tab_contents_wrapper.h (working copy)
@@ -56,6 +56,8 @@
}
namespace extensions {
+class ActionBoxController;
+class ScriptExecutor;
class WebNavigationTabObserver;
}
@@ -132,6 +134,14 @@
CoreTabHelper* core_tab_helper() { return core_tab_helper_.get(); }
+ extensions::ScriptExecutor* extension_script_executor() {
+ return extension_script_executor_.get();
+ }
+
+ extensions::ActionBoxController* extension_action_box_controller() {
+ return extension_action_box_controller_.get();
+ }
+
ExtensionTabHelper* extension_tab_helper() {
return extension_tab_helper_.get();
}
@@ -228,7 +238,9 @@
scoped_ptr<BookmarkTabHelper> bookmark_tab_helper_;
scoped_ptr<ConstrainedWindowTabHelper> constrained_window_tab_helper_;
scoped_ptr<CoreTabHelper> core_tab_helper_;
+ scoped_ptr<extensions::ScriptExecutor> extension_script_executor_;
scoped_ptr<ExtensionTabHelper> extension_tab_helper_;
+ scoped_ptr<extensions::ActionBoxController> extension_action_box_controller_;
scoped_ptr<FaviconTabHelper> favicon_tab_helper_;
scoped_ptr<FindTabHelper> find_tab_helper_;
scoped_ptr<HistoryTabHelper> history_tab_helper_;
« no previous file with comments | « chrome/browser/ui/gtk/location_bar_view_gtk.cc ('k') | chrome/browser/ui/tab_contents/tab_contents_wrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698