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

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

Issue 13820009: Create a ManagedModeNavigationObserver only for managed users. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix the other test. Created 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/browser_tab_contents.cc
diff --git a/chrome/browser/ui/browser_tab_contents.cc b/chrome/browser/ui/browser_tab_contents.cc
index fdcaa16fa2609e12afe354deaec94950d49e7186..1ab5caed4b56f8f5de5732b5ac60cf891c7cec9b 100644
--- a/chrome/browser/ui/browser_tab_contents.cc
+++ b/chrome/browser/ui/browser_tab_contents.cc
@@ -57,6 +57,11 @@
#include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
#endif
+#if defined(ENABLE_MANAGED_USERS)
+#include "chrome/browser/managed_mode/managed_user_service.h"
+#include "chrome/browser/managed_mode/managed_user_service_factory.h"
+#endif
+
#if defined(ENABLE_PRINTING)
#include "chrome/browser/printing/print_preview_message_handler.h"
#include "chrome/browser/printing/print_view_manager.h"
@@ -131,7 +136,6 @@ void BrowserTabContents::AttachTabHelpers(WebContents* web_contents) {
HistoryTabHelper::CreateForWebContents(web_contents);
HungPluginTabHelper::CreateForWebContents(web_contents);
InfoBarService::CreateForWebContents(web_contents);
- ManagedModeNavigationObserver::CreateForWebContents(web_contents);
NavigationMetricsRecorder::CreateForWebContents(web_contents);
if (OmniboxSearchHint::IsEnabled(profile))
OmniboxSearchHint::CreateForWebContents(web_contents);
@@ -161,6 +165,13 @@ void BrowserTabContents::AttachTabHelpers(WebContents* web_contents) {
captive_portal::CaptivePortalTabHelper::CreateForWebContents(web_contents);
#endif
+#if defined(ENABLE_MANAGED_USERS)
+ ManagedUserService* service =
+ ManagedUserServiceFactory::GetForProfile(profile);
+ if (service->ProfileIsManaged())
+ ManagedModeNavigationObserver::CreateForWebContents(web_contents);
+#endif
+
#if defined(ENABLE_PRINTING)
printing::PrintPreviewMessageHandler::CreateForWebContents(web_contents);
printing::PrintViewManager::CreateForWebContents(web_contents);

Powered by Google App Engine
This is Rietveld 408576698