[MD History] Disable MD History for supervised users.

chrome/browser/ui/webui/uber/uber_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/uber/uber_ui.h"
 
 #include "base/stl_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
 #include "chrome/browser/ui/webui/extensions/extensions_ui.h"
 #include "chrome/browser/ui/webui/log_web_ui_url.h"
+#include "chrome/browser/ui/webui/md_history_ui.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/chrome_manifest_url_handlers.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_controller.h"
@@ skipping 52 matching lines @@
       return true;
   }
 
   return false;
 }
 
 content::WebUIDataSource* CreateUberFrameHTMLSource(
     content::BrowserContext* browser_context) {
   content::WebUIDataSource* source =
       content::WebUIDataSource::Create(chrome::kChromeUIUberFrameHost);
+  Profile* profile = Profile::FromBrowserContext(browser_context);
 
   source->SetJsonPath("strings.js");
   source->AddResourcePath("uber_frame.js", IDR_UBER_FRAME_JS);
   source->SetDefaultResource(IDR_UBER_FRAME_HTML);
 
   // TODO(jhawkins): Attempt to get rid of IDS_SHORT_PRODUCT_OS_NAME.
 #if defined(OS_CHROMEOS)
   source->AddLocalizedString("shortProductName", IDS_SHORT_PRODUCT_OS_NAME);
 #else
   source->AddLocalizedString("shortProductName", IDS_SHORT_PRODUCT_NAME);
 #endif  // defined(OS_CHROMEOS)
 
   source->AddBoolean("hideExtensions", ::switches::MdExtensionsEnabled());
   source->AddBoolean("hideSettingsAndHelp",
                      ::switches::SettingsWindowEnabled());
   source->AddString("extensionsHost", chrome::kChromeUIExtensionsHost);
   source->AddLocalizedString("extensionsDisplayName",
                              IDS_MANAGE_EXTENSIONS_SETTING_WINDOWS_TITLE);
   source->AddString("helpHost", chrome::kChromeUIHelpHost);
   source->AddLocalizedString("helpDisplayName", IDS_ABOUT_TITLE);
   source->AddString("historyHost", chrome::kChromeUIHistoryHost);
   source->AddLocalizedString("historyDisplayName", IDS_HISTORY_TITLE);
   source->AddString("settingsHost", chrome::kChromeUISettingsHost);
   source->AddLocalizedString("settingsDisplayName", IDS_SETTINGS_TITLE);
   bool overrides_history =
       HasExtensionType(browser_context, chrome::kChromeUIHistoryHost);
   source->AddString("overridesHistory", overrides_history ? "yes" : "no");
   source->AddBoolean(
       "hideHistory",
-      base::FeatureList::IsEnabled(features::kMaterialDesignHistoryFeature)
+      MdHistoryUI::IsEnabled(profile)
       && !overrides_history);
 
   source->DisableDenyXFrameOptions();
   source->OverrideContentSecurityPolicyFrameSrc("frame-src chrome:;");
 
   source->AddBoolean("profileIsGuest",
-      Profile::FromBrowserContext(browser_context)->IsGuestSession());
+      profile->IsGuestSession());

[Dan Beam, 2016/06/03 04:51:07]

unwrap

 
   return source;
 }
 
 void UpdateHistoryNavigation(content::WebUI* web_ui) {
   bool overrides_history =
       HasExtensionType(web_ui->GetWebContents()->GetBrowserContext(),
                        chrome::kChromeUIHistoryHost);
   web_ui->CallJavascriptFunction(
       "uber_frame.setNavigationOverride",
@@ skipping 109 matching lines @@
   // opens the default history page if one is uninstalled or disabled.
   UpdateHistoryNavigation(web_ui());
 }
 
 void UberFrameUI::OnExtensionUnloaded(
     content::BrowserContext* browser_context,
     const extensions::Extension* extension,
     extensions::UnloadedExtensionInfo::Reason reason) {
   UpdateHistoryNavigation(web_ui());
 }