Componentizing SafeBrowsingBlockingPage Part 1

chrome/browser/interstitials/chrome_controller_client.cc

 // Copyright 2015 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/interstitials/chrome_controller_client.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/process/launch.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/interstitials/chrome_metrics_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/url_constants.h"
 #include "components/prefs/pref_service.h"
 #include "components/safe_browsing_db/safe_browsing_prefs.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/common/referrer.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/intent_helper.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/chrome_pages.h"
-#include "chrome/common/url_constants.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/base_paths_win.h"
 #include "base/path_service.h"
 #include "base/strings/string16.h"
 #include "base/win/windows_version.h"
 #endif
 
 using content::Referrer;
@@ skipping 112 matching lines @@
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE, FROM_HERE,
       base::Bind(&LaunchDateAndTimeSettingsOnFileThread));
 #endif
 }
 
 void ChromeControllerClient::GoBack() {
   interstitial_page_->DontProceed();
 }
 
+// If the offending entry has committed, go back or to a safe page without
+// closing th error page. This error page will be closed when the new page

[estark, 2016/12/15 21:16:34]

typo: th => the

[Jialiu Lin, 2016/12/15 22:12:53]

Oops. Thanks for catching this. 

+// commits.
+void ChromeControllerClient::GoBackAfterNavigationCommitted() {
+  if (web_contents_->GetController().CanGoBack()) {
+    web_contents_->GetController().GoBack();
+  } else {
+    web_contents_->GetController().LoadURL(
+        GURL(chrome::kChromeUINewTabURL), content::Referrer(),
+        ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string());
+  }
+}
+
 void ChromeControllerClient::Proceed() {
   interstitial_page_->Proceed();
 }
 
 void ChromeControllerClient::Reload() {
   web_contents_->GetController().Reload(true);
 }
 
 void ChromeControllerClient::OpenUrlInCurrentTab(const GURL& url) {
   content::OpenURLParams params(url, Referrer(),
                                 WindowOpenDisposition::CURRENT_TAB,
                                 ui::PAGE_TRANSITION_LINK, false);
   web_contents_->OpenURL(params);
 }
 
 const std::string& ChromeControllerClient::GetApplicationLocale() {
   return g_browser_process->GetApplicationLocale();
 }
 
 PrefService* ChromeControllerClient::GetPrefService() {
   Profile* profile =
       Profile::FromBrowserContext(web_contents_->GetBrowserContext());
   return profile->GetPrefs();
 }
 
 const std::string ChromeControllerClient::GetExtendedReportingPrefName() {
   return safe_browsing::GetExtendedReportingPrefName(*GetPrefService());
 }