Moving web_view.js to extensions.

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 "base/command_line.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 224 matching lines @@
   // Platform app sources that are not API-specific..
   source_map->RegisterSource("appView", IDR_APP_VIEW_JS);
   source_map->RegisterSource("fileEntryBindingUtil",
                              IDR_FILE_ENTRY_BINDING_UTIL_JS);
   source_map->RegisterSource("extensionOptions", IDR_EXTENSION_OPTIONS_JS);
   source_map->RegisterSource("extensionOptionsEvents",
                              IDR_EXTENSION_OPTIONS_EVENTS_JS);
   source_map->RegisterSource("tagWatcher", IDR_TAG_WATCHER_JS);
   source_map->RegisterSource("chromeWebViewInternal",
                              IDR_CHROME_WEB_VIEW_INTERNAL_CUSTOM_BINDINGS_JS);
-  // Note: webView not webview so that this doesn't interfere with the
-  // chrome.webview API bindings.
-  source_map->RegisterSource("webView", IDR_WEB_VIEW_JS);
-  source_map->RegisterSource("webViewEvents", IDR_WEB_VIEW_EVENTS_JS);
-  source_map->RegisterSource("webViewExperimental",
-                             IDR_WEB_VIEW_EXPERIMENTAL_JS);
+  source_map->RegisterSource("chromeWebView", IDR_CHROME_WEB_VIEW_JS);
+  source_map->RegisterSource("chromeWebViewExperimental",
+                             IDR_CHROME_WEB_VIEW_EXPERIMENTAL_JS);
   source_map->RegisterSource("webViewRequest",
                              IDR_WEB_VIEW_REQUEST_CUSTOM_BINDINGS_JS);
   source_map->RegisterSource("denyAppView", IDR_APP_VIEW_DENY_JS);
-  source_map->RegisterSource("denyWebView", IDR_WEB_VIEW_DENY_JS);
   source_map->RegisterSource("injectAppTitlebar", IDR_INJECT_APP_TITLEBAR_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();
 
   // 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() <= chrome::VersionInfo::CHANNEL_DEV &&
       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()) {

[Fady Samuel, 2014/09/11 19:24:03]

This check should be done in extensions as well.

[lfg, 2014/09/11 19:27:59]

I'll do it in a future patch. This patch only moves web_view.js to extensions,
it still doesn't expose it in extensions (i.e. module_system->Require("webView")
still isn't called from extensions).

[Fady Samuel, 2014/09/11 19:31:39]

I'm surprised/confused that webview works at all then if we're not injecting
webView anywhere? Am I missing something?

-    module_system->Require("webView");
-    if (context->GetAvailability("webViewExperimentalInternal").is_available())
-      module_system->Require("webViewExperimental");
+    module_system->Require("chromeWebView");
+    if (context->GetAvailability("webViewExperimentalInternal")
+            .is_available()) {
+      module_system->Require("chromeWebViewExperimental");
+    }
   } else if (context_type == extensions::Feature::BLESSED_EXTENSION_CONTEXT) {
     module_system->Require("denyWebView");
   }
 
   if (extensions::FeatureSwitch::app_view()->IsEnabled() &&
       context->GetAvailability("appViewEmbedderInternal").is_available()) {
     module_system->Require("appView");
   } else if (context_type == extensions::Feature::BLESSED_EXTENSION_CONTEXT) {
     module_system->Require("denyAppView");
   }
@@ skipping 57 matching lines @@
       new extensions::PermissionSet(extensions::APIPermissionSet(),
                                     extensions::ManifestPermissionSet(),
                                     origin_set,
                                     extensions::URLPatternSet()));
 }
 
 void ChromeExtensionsDispatcherDelegate::HandleWebRequestAPIUsage(
     bool webrequest_used) {
   webrequest_used_ = webrequest_used;
 }