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

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

Issue 10014013: Add a hang monitor for Pepper plugins (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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
« no previous file with comments | « chrome/browser/ui/tab_contents/tab_contents_wrapper.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 17 matching lines...) Expand all
28 #include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h" 28 #include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h"
29 #include "chrome/browser/sessions/restore_tab_helper.h" 29 #include "chrome/browser/sessions/restore_tab_helper.h"
30 #include "chrome/browser/tab_contents/tab_contents_ssl_helper.h" 30 #include "chrome/browser/tab_contents/tab_contents_ssl_helper.h"
31 #include "chrome/browser/tab_contents/thumbnail_generator.h" 31 #include "chrome/browser/tab_contents/thumbnail_generator.h"
32 #include "chrome/browser/translate/translate_tab_helper.h" 32 #include "chrome/browser/translate/translate_tab_helper.h"
33 #include "chrome/browser/ui/alternate_error_tab_observer.h" 33 #include "chrome/browser/ui/alternate_error_tab_observer.h"
34 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" 34 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
35 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" 35 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
36 #include "chrome/browser/ui/constrained_window_tab_helper.h" 36 #include "chrome/browser/ui/constrained_window_tab_helper.h"
37 #include "chrome/browser/ui/find_bar/find_tab_helper.h" 37 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
38 #include "chrome/browser/ui/hung_plugin_tab_helper.h"
38 #include "chrome/browser/ui/intents/web_intent_picker_controller.h" 39 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
39 #include "chrome/browser/ui/pdf/pdf_tab_observer.h" 40 #include "chrome/browser/ui/pdf/pdf_tab_observer.h"
40 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 41 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
41 #include "chrome/browser/ui/sad_tab_helper.h" 42 #include "chrome/browser/ui/sad_tab_helper.h"
42 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h" 43 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
43 #include "chrome/browser/ui/snapshot_tab_helper.h" 44 #include "chrome/browser/ui/snapshot_tab_helper.h"
44 #include "chrome/browser/ui/sync/one_click_signin_helper.h" 45 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
45 #include "chrome/browser/ui/sync/tab_contents_wrapper_synced_tab_delegate.h" 46 #include "chrome/browser/ui/sync/tab_contents_wrapper_synced_tab_delegate.h"
46 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" 47 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
47 #include "chrome/common/chrome_switches.h" 48 #include "chrome/common/chrome_switches.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 automation_tab_helper_.reset(new AutomationTabHelper(contents)); 86 automation_tab_helper_.reset(new AutomationTabHelper(contents));
86 #endif 87 #endif
87 blocked_content_tab_helper_.reset(new BlockedContentTabHelper(this)); 88 blocked_content_tab_helper_.reset(new BlockedContentTabHelper(this));
88 bookmark_tab_helper_.reset(new BookmarkTabHelper(this)); 89 bookmark_tab_helper_.reset(new BookmarkTabHelper(this));
89 constrained_window_tab_helper_.reset(new ConstrainedWindowTabHelper(this)); 90 constrained_window_tab_helper_.reset(new ConstrainedWindowTabHelper(this));
90 core_tab_helper_.reset(new CoreTabHelper(contents)); 91 core_tab_helper_.reset(new CoreTabHelper(contents));
91 extension_tab_helper_.reset(new ExtensionTabHelper(this)); 92 extension_tab_helper_.reset(new ExtensionTabHelper(this));
92 favicon_tab_helper_.reset(new FaviconTabHelper(contents)); 93 favicon_tab_helper_.reset(new FaviconTabHelper(contents));
93 find_tab_helper_.reset(new FindTabHelper(contents)); 94 find_tab_helper_.reset(new FindTabHelper(contents));
94 history_tab_helper_.reset(new HistoryTabHelper(contents)); 95 history_tab_helper_.reset(new HistoryTabHelper(contents));
96 hung_plugin_tab_helper_.reset(new HungPluginTabHelper(contents));
95 infobar_tab_helper_.reset(new InfoBarTabHelper(contents)); 97 infobar_tab_helper_.reset(new InfoBarTabHelper(contents));
96 password_manager_delegate_.reset(new PasswordManagerDelegateImpl(this)); 98 password_manager_delegate_.reset(new PasswordManagerDelegateImpl(this));
97 password_manager_.reset( 99 password_manager_.reset(
98 new PasswordManager(contents, password_manager_delegate_.get())); 100 new PasswordManager(contents, password_manager_delegate_.get()));
99 prefs_tab_helper_.reset(new PrefsTabHelper(contents)); 101 prefs_tab_helper_.reset(new PrefsTabHelper(contents));
100 prerender_tab_helper_.reset(new prerender::PrerenderTabHelper(this)); 102 prerender_tab_helper_.reset(new prerender::PrerenderTabHelper(this));
101 restore_tab_helper_.reset(new RestoreTabHelper(contents)); 103 restore_tab_helper_.reset(new RestoreTabHelper(contents));
102 search_engine_tab_helper_.reset(new SearchEngineTabHelper(contents)); 104 search_engine_tab_helper_.reset(new SearchEngineTabHelper(contents));
103 snapshot_tab_helper_.reset(new SnapshotTabHelper(contents)); 105 snapshot_tab_helper_.reset(new SnapshotTabHelper(contents));
104 ssl_helper_.reset(new TabContentsSSLHelper(this)); 106 ssl_helper_.reset(new TabContentsSSLHelper(this));
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 206
205 //////////////////////////////////////////////////////////////////////////////// 207 ////////////////////////////////////////////////////////////////////////////////
206 // WebContentsObserver overrides 208 // WebContentsObserver overrides
207 209
208 void TabContentsWrapper::WebContentsDestroyed(WebContents* tab) { 210 void TabContentsWrapper::WebContentsDestroyed(WebContents* tab) {
209 // Destruction of the WebContents should only be done by us from our 211 // Destruction of the WebContents should only be done by us from our
210 // destructor. Otherwise it's very likely we (or one of the helpers we own) 212 // destructor. Otherwise it's very likely we (or one of the helpers we own)
211 // will attempt to access the TabContents and we'll crash. 213 // will attempt to access the TabContents and we'll crash.
212 DCHECK(in_destructor_); 214 DCHECK(in_destructor_);
213 } 215 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/tab_contents/tab_contents_wrapper.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698