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

Side by Side Diff: chrome/browser/ui/tab_contents/tab_contents_wrapper.h

Issue 10388160: Only return the visible page actions from PageActionController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Change ownership of extension stuff, revert change to extension_action_box 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 unified diff | Download patch | Annotate | Revision Log
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_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ 5 #ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
6 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ 6 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 BookmarkTabHelper* bookmark_tab_helper() { 127 BookmarkTabHelper* bookmark_tab_helper() {
128 return bookmark_tab_helper_.get(); 128 return bookmark_tab_helper_.get();
129 } 129 }
130 130
131 ConstrainedWindowTabHelper* constrained_window_tab_helper() { 131 ConstrainedWindowTabHelper* constrained_window_tab_helper() {
132 return constrained_window_tab_helper_.get(); 132 return constrained_window_tab_helper_.get();
133 } 133 }
134 134
135 CoreTabHelper* core_tab_helper() { return core_tab_helper_.get(); } 135 CoreTabHelper* core_tab_helper() { return core_tab_helper_.get(); }
136 136
137 extensions::ScriptExecutor* extension_script_executor() {
138 return extension_script_executor_.get();
139 }
140
141 extensions::ActionBoxController* extension_action_box_controller() {
142 return extension_action_box_controller_.get();
143 }
144
145 ExtensionTabHelper* extension_tab_helper() { 137 ExtensionTabHelper* extension_tab_helper() {
146 return extension_tab_helper_.get(); 138 return extension_tab_helper_.get();
147 } 139 }
148 140
149 const ExtensionTabHelper* extension_tab_helper() const { 141 const ExtensionTabHelper* extension_tab_helper() const {
150 return extension_tab_helper_.get(); 142 return extension_tab_helper_.get();
151 } 143 }
152 144
153 FaviconTabHelper* favicon_tab_helper() { return favicon_tab_helper_.get(); } 145 FaviconTabHelper* favicon_tab_helper() { return favicon_tab_helper_.get(); }
154 FindTabHelper* find_tab_helper() { return find_tab_helper_.get(); } 146 FindTabHelper* find_tab_helper() { return find_tab_helper_.get(); }
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 // "Tab Helpers" section in the member functions area, above.) 223 // "Tab Helpers" section in the member functions area, above.)
232 224
233 scoped_ptr<AutocompleteHistoryManager> autocomplete_history_manager_; 225 scoped_ptr<AutocompleteHistoryManager> autocomplete_history_manager_;
234 scoped_refptr<AutofillManager> autofill_manager_; 226 scoped_refptr<AutofillManager> autofill_manager_;
235 scoped_ptr<AutofillExternalDelegate> autofill_external_delegate_; 227 scoped_ptr<AutofillExternalDelegate> autofill_external_delegate_;
236 scoped_ptr<AutomationTabHelper> automation_tab_helper_; 228 scoped_ptr<AutomationTabHelper> automation_tab_helper_;
237 scoped_ptr<BlockedContentTabHelper> blocked_content_tab_helper_; 229 scoped_ptr<BlockedContentTabHelper> blocked_content_tab_helper_;
238 scoped_ptr<BookmarkTabHelper> bookmark_tab_helper_; 230 scoped_ptr<BookmarkTabHelper> bookmark_tab_helper_;
239 scoped_ptr<ConstrainedWindowTabHelper> constrained_window_tab_helper_; 231 scoped_ptr<ConstrainedWindowTabHelper> constrained_window_tab_helper_;
240 scoped_ptr<CoreTabHelper> core_tab_helper_; 232 scoped_ptr<CoreTabHelper> core_tab_helper_;
241 scoped_ptr<extensions::ScriptExecutor> extension_script_executor_;
242 scoped_ptr<ExtensionTabHelper> extension_tab_helper_; 233 scoped_ptr<ExtensionTabHelper> extension_tab_helper_;
243 scoped_ptr<extensions::ActionBoxController> extension_action_box_controller_;
244 scoped_ptr<FaviconTabHelper> favicon_tab_helper_; 234 scoped_ptr<FaviconTabHelper> favicon_tab_helper_;
245 scoped_ptr<FindTabHelper> find_tab_helper_; 235 scoped_ptr<FindTabHelper> find_tab_helper_;
246 scoped_ptr<HistoryTabHelper> history_tab_helper_; 236 scoped_ptr<HistoryTabHelper> history_tab_helper_;
247 scoped_ptr<HungPluginTabHelper> hung_plugin_tab_helper_; 237 scoped_ptr<HungPluginTabHelper> hung_plugin_tab_helper_;
248 scoped_ptr<InfoBarTabHelper> infobar_tab_helper_; 238 scoped_ptr<InfoBarTabHelper> infobar_tab_helper_;
249 239
250 // PasswordManager and its delegate. The delegate must outlive the manager, 240 // PasswordManager and its delegate. The delegate must outlive the manager,
251 // per documentation in password_manager.h. 241 // per documentation in password_manager.h.
252 scoped_ptr<PasswordManagerDelegate> password_manager_delegate_; 242 scoped_ptr<PasswordManagerDelegate> password_manager_delegate_;
253 scoped_ptr<PasswordManager> password_manager_; 243 scoped_ptr<PasswordManager> password_manager_;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 290
301 // The supporting objects need to outlive the WebContents dtor (as they may 291 // The supporting objects need to outlive the WebContents dtor (as they may
302 // be called upon during its execution). As a result, this must come last 292 // be called upon during its execution). As a result, this must come last
303 // in the list. 293 // in the list.
304 scoped_ptr<content::WebContents> web_contents_; 294 scoped_ptr<content::WebContents> web_contents_;
305 295
306 DISALLOW_COPY_AND_ASSIGN(TabContentsWrapper); 296 DISALLOW_COPY_AND_ASSIGN(TabContentsWrapper);
307 }; 297 };
308 298
309 #endif // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ 299 #endif // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698