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

Unified Diff: chrome/browser/ui/tab_contents/tab_contents.cc

Issue 10826164: Add infobar for PPAPI broker usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync 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:
View side-by-side diff with in-line comments
Download patch
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 d18695fe7bfadc7afb43e0bfc4dae80f3abd2519..2ddada1156011f1954ef553dfa2c124506157abc 100644
--- a/chrome/browser/ui/tab_contents/tab_contents.cc
+++ b/chrome/browser/ui/tab_contents/tab_contents.cc
@@ -22,6 +22,7 @@
#include "chrome/browser/omnibox_search_hint.h"
#include "chrome/browser/password_manager/password_manager.h"
#include "chrome/browser/password_manager/password_manager_delegate_impl.h"
+#include "chrome/browser/pepper_broker_observer.h"
#include "chrome/browser/plugin_observer.h"
#include "chrome/browser/prerender/prerender_tab_helper.h"
#include "chrome/browser/printing/print_preview_message_handler.h"
@@ -165,15 +166,15 @@ TabContents::TabContents(WebContents* contents)
// Create the per-tab observers.
alternate_error_page_tab_observer_.reset(
new AlternateErrorPageTabObserver(contents, profile()));
- webnavigation_observer_.reset(
- new extensions::WebNavigationTabObserver(contents));
external_protocol_observer_.reset(new ExternalProtocolObserver(contents));
navigation_metrics_recorder_.reset(new NavigationMetricsRecorder(contents));
pdf_tab_observer_.reset(new PDFTabObserver(this));
+ pepper_broker_observer_.reset(new PepperBrokerObserver(contents));
+ plugin_observer_.reset(new PluginObserver(this));
safe_browsing_tab_observer_.reset(
new safe_browsing::SafeBrowsingTabObserver(this));
-
- plugin_observer_.reset(new PluginObserver(this));
+ webnavigation_observer_.reset(
+ new extensions::WebNavigationTabObserver(contents));
#if !defined(OS_ANDROID)
if (OmniboxSearchHint::IsEnabled(profile()))
« no previous file with comments | « chrome/browser/ui/tab_contents/tab_contents.h ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698