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

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

Issue 10388160: Only return the visible page actions from PageActionController. (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 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 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 5 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "chrome/browser/autocomplete_history_manager.h" 9 #include "chrome/browser/autocomplete_history_manager.h"
10 #include "chrome/browser/autofill/autofill_external_delegate.h" 10 #include "chrome/browser/autofill/autofill_external_delegate.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 automation_tab_helper_.reset(new AutomationTabHelper(contents)); 91 automation_tab_helper_.reset(new AutomationTabHelper(contents));
92 #endif 92 #endif
93 blocked_content_tab_helper_.reset(new BlockedContentTabHelper(this)); 93 blocked_content_tab_helper_.reset(new BlockedContentTabHelper(this));
94 bookmark_tab_helper_.reset(new BookmarkTabHelper(this)); 94 bookmark_tab_helper_.reset(new BookmarkTabHelper(this));
95 constrained_window_tab_helper_.reset(new ConstrainedWindowTabHelper(this)); 95 constrained_window_tab_helper_.reset(new ConstrainedWindowTabHelper(this));
96 core_tab_helper_.reset(new CoreTabHelper(contents)); 96 core_tab_helper_.reset(new CoreTabHelper(contents));
97 extension_tab_helper_.reset(new ExtensionTabHelper(this)); 97 extension_tab_helper_.reset(new ExtensionTabHelper(this));
98 extension_script_executor_.reset( 98 extension_script_executor_.reset(
99 new extensions::ScriptExecutorImpl(web_contents())); 99 new extensions::ScriptExecutorImpl(web_contents()));
100 extension_action_box_controller_.reset( 100 extension_action_box_controller_.reset(
101 new extensions::PageActionController(this)); 101 new extensions::PageActionController(this, extension_tab_helper_.get()));
102 favicon_tab_helper_.reset(new FaviconTabHelper(contents)); 102 favicon_tab_helper_.reset(new FaviconTabHelper(contents));
103 find_tab_helper_.reset(new FindTabHelper(contents)); 103 find_tab_helper_.reset(new FindTabHelper(contents));
104 history_tab_helper_.reset(new HistoryTabHelper(contents)); 104 history_tab_helper_.reset(new HistoryTabHelper(contents));
105 hung_plugin_tab_helper_.reset(new HungPluginTabHelper(contents)); 105 hung_plugin_tab_helper_.reset(new HungPluginTabHelper(contents));
106 infobar_tab_helper_.reset(new InfoBarTabHelper(contents)); 106 infobar_tab_helper_.reset(new InfoBarTabHelper(contents));
107 password_manager_delegate_.reset(new PasswordManagerDelegateImpl(this)); 107 password_manager_delegate_.reset(new PasswordManagerDelegateImpl(this));
108 password_manager_.reset( 108 password_manager_.reset(
109 new PasswordManager(contents, password_manager_delegate_.get())); 109 new PasswordManager(contents, password_manager_delegate_.get()));
110 prefs_tab_helper_.reset(new PrefsTabHelper(contents)); 110 prefs_tab_helper_.reset(new PrefsTabHelper(contents));
111 prerender_tab_helper_.reset(new prerender::PrerenderTabHelper(this)); 111 prerender_tab_helper_.reset(new prerender::PrerenderTabHelper(this));
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 215
216 //////////////////////////////////////////////////////////////////////////////// 216 ////////////////////////////////////////////////////////////////////////////////
217 // WebContentsObserver overrides 217 // WebContentsObserver overrides
218 218
219 void TabContentsWrapper::WebContentsDestroyed(WebContents* tab) { 219 void TabContentsWrapper::WebContentsDestroyed(WebContents* tab) {
220 // Destruction of the WebContents should only be done by us from our 220 // Destruction of the WebContents should only be done by us from our
221 // destructor. Otherwise it's very likely we (or one of the helpers we own) 221 // destructor. Otherwise it's very likely we (or one of the helpers we own)
222 // will attempt to access the WebContents and we'll crash. 222 // will attempt to access the WebContents and we'll crash.
223 DCHECK(in_destructor_); 223 DCHECK(in_destructor_);
224 } 224 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698