Remove unused packaged app window controls code.

chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc

 // Copyright 2014 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/renderer/extensions/chrome_extensions_dispatcher_delegate.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/sha1.h"
@@ skipping 243 matching lines @@
 
   // Custom types sources.
   source_map->RegisterSource("ChromeSetting", IDR_CHROME_SETTING_JS);
   source_map->RegisterSource("ContentSetting", IDR_CONTENT_SETTING_JS);
   source_map->RegisterSource("ChromeDirectSetting",
                              IDR_CHROME_DIRECT_SETTING_JS);
 
   // Platform app sources that are not API-specific..
   source_map->RegisterSource("fileEntryBindingUtil",
                              IDR_FILE_ENTRY_BINDING_UTIL_JS);
-  source_map->RegisterSource("tagWatcher", IDR_TAG_WATCHER_JS);
   source_map->RegisterSource("chromeWebViewInternal",
                              IDR_CHROME_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS);
   source_map->RegisterSource("chromeWebView", IDR_CHROME_WEB_VIEW_JS);
 }
 
 void ChromeExtensionsDispatcherDelegate::RequireAdditionalModules(
-    extensions::ScriptContext* context,
-    bool is_within_platform_app) {
-  extensions::ModuleSystem* module_system = context->module_system();
-  extensions::Feature::Context context_type = context->context_type();
+    extensions::ScriptContext* context) {
+  if (context->GetAvailability("webViewInternal").is_available()) {
+    // TODO(fsamuel): Eagerly calling Require on context startup is expensive.
+    // It would be better if there were a light way of detecting when a webview
+    // or appview is created and only then set up the infrastructure.
 
-  // TODO(kalman, fsamuel): Eagerly calling Require on context startup is
-  // expensive. It would be better if there were a light way of detecting when
-  // a webview or appview is created and only then set up the infrastructure.
-  if (context_type == extensions::Feature::BLESSED_EXTENSION_CONTEXT &&
-      is_within_platform_app &&
-      extensions::GetCurrentChannel() <= version_info::Channel::DEV &&
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          extensions::switches::kEnableAppWindowControls)) {
-    module_system->Require("windowControls");
-  }
-
-  // Note: setting up the WebView class here, not the chrome.webview API.
-  // The API will be automatically set up when first used.
-  if (context->GetAvailability("webViewInternal").is_available()) {
-    module_system->Require("chromeWebView");
+    // Note: setting up the WebView class here, not the chrome.webview API.

[tapted, 2016/12/16 03:07:09]

optional nit: this comment could stay above the `if`, and the `Require` comment
be attached to the next line. That might be slightly clearer

[benwells, 2016/12/19 03:54:13]

Done.

+    // The API will be automatically set up when first used.
+    context->module_system()->Require("chromeWebView");
   }
 }
 
 void ChromeExtensionsDispatcherDelegate::OnActiveExtensionsUpdated(
     const std::set<std::string>& extension_ids) {
   // In single-process mode, the browser process reports the active extensions.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           ::switches::kSingleProcess))
     return;
   crash_keys::SetActiveExtensions(extension_ids);
 }