Support manual (white|black)list, previewing and allowing after interstitial

chrome/browser/managed_mode/managed_mode_interstitial.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/managed_mode/managed_mode_interstitial.h"
 
 #include "base/i18n/rtl.h"
+#include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
@@ skipping 13 matching lines @@
                                 const base::Callback<void(bool)>& callback) {
   // The tab might have been closed.
   content::WebContents* web_contents =
       tab_util::GetWebContentsByID(render_process_host_id, render_view_id);
   if (!web_contents) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE, base::Bind(callback, true));
     return;
   }
 
+  ManagedModeNavigationObserver* navigation_observer =
+      ManagedModeNavigationObserver::FromWebContents(web_contents);
+  navigation_observer->MarkShownInterstitial();
+
   new ManagedModeInterstitial(web_contents, url, callback);
 }
 
 void GoToNewTabPage(content::WebContents* web_contents) {
   web_contents->GetDelegate()->OpenURLFromTab(
       web_contents,
       content::OpenURLParams(GURL(chrome::kChromeUINewTabURL),
                              content::Referrer(),
                              CURRENT_TAB,
                              content::PAGE_TRANSITION_LINK,
@@ skipping 47 matching lines @@
   strings.SetString("backButton", l10n_util::GetStringUTF16(IDS_BACK_BUTTON));
   strings.SetString("familyUrlsSectionButton",
                     l10n_util::GetStringUTF16(IDS_FAMILY_URLS_SECTION_BUTTON));
   strings.SetString("textdirection", base::i18n::IsRTL() ? "rtl" : "ltr");
 
   base::StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_BLOCK_INTERSTITIAL_HTML));
 
   return jstemplate_builder::GetI18nTemplateHtml(html, &strings);
-  
+

[Bernhard Bauer, 2012/11/26 16:06:30]

Nit: Unnecessary newline

[Sergiu, 2012/11/27 15:37:34]

Done.

 }
 
 void ManagedModeInterstitial::CommandReceived(const std::string& command) {
   if (command == "\"allow\"") {
     interstitial_page_->Proceed();
     return;
   }
 
   if (command == "\"back\"") {
     interstitial_page_->DontProceed();
@@ skipping 13 matching lines @@
 }
 
 void ManagedModeInterstitial::OnDontProceed() {
   DispatchContinueRequest(false);
 }
 
 void ManagedModeInterstitial::DispatchContinueRequest(bool continue_request) {
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           base::Bind(callback_, continue_request));
 }