diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-19 00:42:30 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-19 00:42:30 +0000 |
| commit | a3a1d14240d6e41a0b6732ebcd3600399c64b26a (patch) | |
| tree | a38ced2761bdf4447bf180470fd5dade857ef11b /chrome/browser/automation | |
| parent | 5b62083c99317965244123c031c707d53f0a03f1 (diff) | |
| download | chromium_src-a3a1d14240d6e41a0b6732ebcd3600399c64b26a.zip chromium_src-a3a1d14240d6e41a0b6732ebcd3600399c64b26a.tar.gz chromium_src-a3a1d14240d6e41a0b6732ebcd3600399c64b26a.tar.bz2 | |
Review URL: http://codereview.chromium.org/14809
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7281 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
| -rw-r--r-- | chrome/browser/automation/automation_provider.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 2f2b6b5..3a36b52 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -588,7 +588,7 @@ class DocumentPrintedNotificationObserver : public NotificationObserver { class AutomationInterstitialPage : public InterstitialPage { public: - AutomationInterstitialPage(TabContents* tab, + AutomationInterstitialPage(WebContents* tab, const GURL& url, const std::string& contents) : InterstitialPage(tab, true, url), @@ -1990,7 +1990,7 @@ void AutomationProvider::ShowInterstitialPage(const IPC::Message& message, new AutomationInterstitialPage(web_contents, GURL("about:interstitial"), html_text); - web_contents->ShowInterstitialPage(interstitial); + interstitial->Show(); return; } } @@ -2001,8 +2001,8 @@ void AutomationProvider::ShowInterstitialPage(const IPC::Message& message, void AutomationProvider::HideInterstitialPage(const IPC::Message& message, int tab_handle) { WebContents* web_contents = GetWebContentsForHandle(tab_handle, NULL); - if (web_contents) { - web_contents->HideInterstitialPage(false, false); + if (web_contents && web_contents->interstitial_page()) { + web_contents->interstitial_page()->DontProceed(); Send(new AutomationMsg_HideInterstitialPageResponse(message.routing_id(), true)); return; @@ -2161,7 +2161,7 @@ void AutomationProvider::ActionOnSSLBlockingPage(const IPC::Message& message, if (entry->page_type() == NavigationEntry::INTERSTITIAL_PAGE) { TabContents* tab_contents = tab->GetTabContents(TAB_CONTENTS_WEB); InterstitialPage* ssl_blocking_page = - InterstitialPage::GetInterstitialPage(tab_contents); + InterstitialPage::GetInterstitialPage(tab_contents->AsWebContents()); if (ssl_blocking_page) { if (proceed) { AddNavigationStatusListener(tab, |