Revert 113591 - Revert 113579 - Content settings: allow scripts on interstitial pages even if Jav...

chrome/browser/tab_contents/chrome_interstitial_page.cc

 // Copyright (c) 2011 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/tab_contents/chrome_interstitial_page.h"
 
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/render_messages.h"
+#include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
 ChromeInterstitialPage::ChromeInterstitialPage(TabContents* tab,
                                                bool new_navigation,
                                                const GURL& url)
     : InterstitialPage(tab, new_navigation, url) {
   Profile* profile = Profile::FromBrowserContext(tab->browser_context());
   content::RendererPreferences prefs;
   renderer_preferences_util::UpdateFromSystemSettings(&prefs, profile);
   set_renderer_preferences(prefs);
 }
 
 ChromeInterstitialPage::~ChromeInterstitialPage() {
 }
 
 void ChromeInterstitialPage::Show() {
   InterstitialPage::Show();
 
   notification_registrar_.Add(
       this, chrome::NOTIFICATION_DOM_OPERATION_RESPONSE,
       content::Source<RenderViewHost>(render_view_host()));
+  render_view_host()->Send(
+      new ChromeViewMsg_SetAsInterstitial(render_view_host()->routing_id()));
 }
 
 void ChromeInterstitialPage::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (chrome::NOTIFICATION_DOM_OPERATION_RESPONSE == type) {
     if (enabled()) {
       content::Details<DomOperationNotificationDetails> dom_op_details(details);
       CommandReceived(dom_op_details->json());
     }
     return;
   }
   InterstitialPage::Observe(type, source, details);
 }