chrome/browser/ui/tab_contents/tab_contents.cc - Issue 10961051: Switch PluginObserver to use WebContentsUserData.

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.cc

Issue 10961051: Switch PluginObserver to use WebContentsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 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.cc

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

index fbe6b51bd4a889f761d1e5edb59fcc43a08c0a90..eed8b27c515ad73e1e81964a1ff3d96f7ed9f098 100644

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

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

@@ -141,6 +141,7 @@ TabContents::TabContents(WebContents* contents)

password_manager_delegate_.reset(new PasswordManagerDelegateImpl(this));

password_manager_.reset(

new PasswordManager(contents, password_manager_delegate_.get()));

+ PluginObserver::CreateForWebContents(contents);

prefs_tab_helper_.reset(new PrefsTabHelper(contents));

prerender_tab_helper_.reset(new prerender::PrerenderTabHelper(this));

search_engine_tab_helper_.reset(new SearchEngineTabHelper(contents));

@@ -170,7 +171,6 @@ TabContents::TabContents(WebContents* contents)

external_protocol_observer_.reset(new ExternalProtocolObserver(contents));

navigation_metrics_recorder_.reset(new NavigationMetricsRecorder(contents));

pepper_broker_observer_.reset(new PepperBrokerObserver(contents));

- plugin_observer_.reset(new PluginObserver(this));

safe_browsing_tab_observer_.reset(

new safe_browsing::SafeBrowsingTabObserver(this));

webnavigation_observer_.reset(