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

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

Issue 10381105: Refactor UI "badge" (page action) logic into a BadgeController interface. (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"
11 #include "chrome/browser/autofill/autofill_manager.h" 11 #include "chrome/browser/autofill/autofill_manager.h"
12 #include "chrome/browser/automation/automation_tab_helper.h" 12 #include "chrome/browser/automation/automation_tab_helper.h"
13 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 13 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
14 #include "chrome/browser/download/download_request_limiter_observer.h" 14 #include "chrome/browser/download/download_request_limiter_observer.h"
15 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
16 #include "chrome/browser/extensions/badge_controller.h"
Avi (use Gerrit) 2012/05/11 04:08:57 Do you need this include? You only directly use Pa
not at google - send to devlin 2012/05/11 04:15:44 Nope. Thanks, removed.
15 #include "chrome/browser/extensions/extension_tab_helper.h" 17 #include "chrome/browser/extensions/extension_tab_helper.h"
16 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" 18 #include "chrome/browser/extensions/page_action_controller.h"
17 #include "chrome/browser/external_protocol/external_protocol_observer.h" 19 #include "chrome/browser/external_protocol/external_protocol_observer.h"
18 #include "chrome/browser/favicon/favicon_tab_helper.h" 20 #include "chrome/browser/favicon/favicon_tab_helper.h"
19 #include "chrome/browser/history/history_tab_helper.h" 21 #include "chrome/browser/history/history_tab_helper.h"
20 #include "chrome/browser/infobars/infobar_tab_helper.h" 22 #include "chrome/browser/infobars/infobar_tab_helper.h"
21 #include "chrome/browser/omnibox_search_hint.h" 23 #include "chrome/browser/omnibox_search_hint.h"
22 #include "chrome/browser/password_manager/password_manager.h" 24 #include "chrome/browser/password_manager/password_manager.h"
23 #include "chrome/browser/password_manager_delegate_impl.h" 25 #include "chrome/browser/password_manager_delegate_impl.h"
24 #include "chrome/browser/plugin_observer.h" 26 #include "chrome/browser/plugin_observer.h"
25 #include "chrome/browser/prerender/prerender_tab_helper.h" 27 #include "chrome/browser/prerender/prerender_tab_helper.h"
26 #include "chrome/browser/printing/print_preview_message_handler.h" 28 #include "chrome/browser/printing/print_preview_message_handler.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 autofill_external_delegate_.get()); 85 autofill_external_delegate_.get());
84 } 86 }
85 #if defined(ENABLE_AUTOMATION) 87 #if defined(ENABLE_AUTOMATION)
86 automation_tab_helper_.reset(new AutomationTabHelper(contents)); 88 automation_tab_helper_.reset(new AutomationTabHelper(contents));
87 #endif 89 #endif
88 blocked_content_tab_helper_.reset(new BlockedContentTabHelper(this)); 90 blocked_content_tab_helper_.reset(new BlockedContentTabHelper(this));
89 bookmark_tab_helper_.reset(new BookmarkTabHelper(this)); 91 bookmark_tab_helper_.reset(new BookmarkTabHelper(this));
90 constrained_window_tab_helper_.reset(new ConstrainedWindowTabHelper(this)); 92 constrained_window_tab_helper_.reset(new ConstrainedWindowTabHelper(this));
91 core_tab_helper_.reset(new CoreTabHelper(contents)); 93 core_tab_helper_.reset(new CoreTabHelper(contents));
92 extension_tab_helper_.reset(new ExtensionTabHelper(this)); 94 extension_tab_helper_.reset(new ExtensionTabHelper(this));
95 extensions_badge_controller_.reset(
96 new extensions::PageActionController(this));
93 favicon_tab_helper_.reset(new FaviconTabHelper(contents)); 97 favicon_tab_helper_.reset(new FaviconTabHelper(contents));
94 find_tab_helper_.reset(new FindTabHelper(contents)); 98 find_tab_helper_.reset(new FindTabHelper(contents));
95 history_tab_helper_.reset(new HistoryTabHelper(contents)); 99 history_tab_helper_.reset(new HistoryTabHelper(contents));
96 hung_plugin_tab_helper_.reset(new HungPluginTabHelper(contents)); 100 hung_plugin_tab_helper_.reset(new HungPluginTabHelper(contents));
97 infobar_tab_helper_.reset(new InfoBarTabHelper(contents)); 101 infobar_tab_helper_.reset(new InfoBarTabHelper(contents));
98 password_manager_delegate_.reset(new PasswordManagerDelegateImpl(this)); 102 password_manager_delegate_.reset(new PasswordManagerDelegateImpl(this));
99 password_manager_.reset( 103 password_manager_.reset(
100 new PasswordManager(contents, password_manager_delegate_.get())); 104 new PasswordManager(contents, password_manager_delegate_.get()));
101 prefs_tab_helper_.reset(new PrefsTabHelper(contents)); 105 prefs_tab_helper_.reset(new PrefsTabHelper(contents));
102 prerender_tab_helper_.reset(new prerender::PrerenderTabHelper(this)); 106 prerender_tab_helper_.reset(new prerender::PrerenderTabHelper(this));
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 210
207 //////////////////////////////////////////////////////////////////////////////// 211 ////////////////////////////////////////////////////////////////////////////////
208 // WebContentsObserver overrides 212 // WebContentsObserver overrides
209 213
210 void TabContentsWrapper::WebContentsDestroyed(WebContents* tab) { 214 void TabContentsWrapper::WebContentsDestroyed(WebContents* tab) {
211 // Destruction of the WebContents should only be done by us from our 215 // Destruction of the WebContents should only be done by us from our
212 // destructor. Otherwise it's very likely we (or one of the helpers we own) 216 // destructor. Otherwise it's very likely we (or one of the helpers we own)
213 // will attempt to access the WebContents and we'll crash. 217 // will attempt to access the WebContents and we'll crash.
214 DCHECK(in_destructor_); 218 DCHECK(in_destructor_);
215 } 219 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/tab_contents/tab_contents_wrapper.h ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698