Remove adview

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 231 matching lines @@
   source_map->RegisterSource("tagWatcher", IDR_TAG_WATCHER_JS);
   source_map->RegisterSource("webview", IDR_WEBVIEW_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("webViewExperimental",
                              IDR_WEB_VIEW_EXPERIMENTAL_JS);
   source_map->RegisterSource("webViewRequest",
                              IDR_WEB_VIEW_REQUEST_CUSTOM_BINDINGS_JS);
   source_map->RegisterSource("denyWebView", IDR_WEB_VIEW_DENY_JS);
-  source_map->RegisterSource("adView", IDR_AD_VIEW_JS);
-  source_map->RegisterSource("denyAdView", IDR_AD_VIEW_DENY_JS);
   source_map->RegisterSource("injectAppTitlebar", IDR_INJECT_APP_TITLEBAR_JS);
 }
 
 void ChromeExtensionsDispatcherDelegate::RequireAdditionalModules(
     extensions::ModuleSystem* module_system,
     const extensions::Extension* extension,
     extensions::Feature::Context context_type,
     bool is_within_platform_app) {
   if (context_type == extensions::Feature::BLESSED_EXTENSION_CONTEXT &&
       is_within_platform_app &&
@@ skipping 28 matching lines @@
             hexencoded_id_hash == "1A26E32DE447A17CBE5E9750CDBA78F58539B39C" ||
             hexencoded_id_hash == "59048028102D7B4C681DBC7BC6CD980C3DC66DA3") {
           module_system->Require("webViewExperimental");
         }
       }
     } else {
       module_system->Require("denyWebView");
     }
   }
 
   // Same comment as above for <adview> tag.

[lazyboy, 2014/06/11 22:34:00]

Remove this too.

[Fady Samuel, 2014/06/12 20:53:31]

Done.

   if (context_type == extensions::Feature::BLESSED_EXTENSION_CONTEXT &&
       is_within_platform_app) {
     if (CommandLine::ForCurrentProcess()->HasSwitch(
             ::switches::kEnableAdview)) {

[lazyboy, 2014/06/11 22:33:59]

Remove the switch.

[Fady Samuel, 2014/06/12 20:53:30]

Done.

       if (extension->permissions_data()->HasAPIPermission(
               extensions::APIPermission::kAdView)) {

[lazyboy, 2014/06/11 22:34:00]

Remove adview from permission enum.

[Fady Samuel, 2014/06/12 20:53:31]

Done.

         module_system->Require("adView");
       } else {
         module_system->Require("denyAdView");
       }
     }
   }
 }
 
 void ChromeExtensionsDispatcherDelegate::OnActiveExtensionsUpdated(
     const std::set<std::string>& extension_ids) {
@@ skipping 51 matching lines @@
 }
 
 void ChromeExtensionsDispatcherDelegate::HandleWebRequestAPIUsage(
     bool adblock,
     bool adblock_plus,
     bool other) {
   webrequest_adblock_ = adblock;
   webrequest_adblock_plus_ = adblock_plus;
   webrequest_other_ = other;
 }