chrome/browser/ui/tab_contents/tab_contents_wrapper.cc - Issue 10014013: Add a hang monitor for Pepper plugins

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

index 43e49d36d18eaffc1e23b4bb00fa96c7c353fe82..3d8aaa78bb9445f7dce2cb1c85b2219f42679dfc 100644

--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

+++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

@@ -35,6 +35,7 @@

#include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"

#include "chrome/browser/ui/constrained_window_tab_helper.h"

#include "chrome/browser/ui/find_bar/find_tab_helper.h"

+#include "chrome/browser/ui/hung_plugin_tab_helper.h"

#include "chrome/browser/ui/intents/web_intent_picker_controller.h"

#include "chrome/browser/ui/pdf/pdf_tab_observer.h"

#include "chrome/browser/ui/prefs/prefs_tab_helper.h"

@@ -92,6 +93,7 @@ TabContentsWrapper::TabContentsWrapper(WebContents* contents)

favicon_tab_helper_.reset(new FaviconTabHelper(contents));

find_tab_helper_.reset(new FindTabHelper(contents));

history_tab_helper_.reset(new HistoryTabHelper(contents));

+ hung_plugin_tab_helper_.reset(new HungPluginTabHelper(contents));

infobar_tab_helper_.reset(new InfoBarTabHelper(contents));

password_manager_delegate_.reset(new PasswordManagerDelegateImpl(this));

password_manager_.reset(

« 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 »