HTML screen shouldn't exit on timeout.

BUG=http://code.google.com/p/chromium-os/issues/detail?id=7123
TEST=manual

Review URL: http://codereview.chromium.org/3526003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60934 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 13 insertions, 1 deletions

diff --git a/chrome/browser/chromeos/login/html_page_screen.cc b/chrome/browser/chromeos/login/html_page_screen.cc
index 17bcaf0..8448f08 100644
--- a/chrome/browser/chromeos/login/html_page_screen.cc
+++ b/chrome/browser/chromeos/login/html_page_screen.cc
@@ -107,6 +107,14 @@ void HTMLPageScreen::OnPageLoadFailed(const std::string& url) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
+// HTMLPageScreen, WebPageScreen implementation:
+void HTMLPageScreen::OnNetworkTimeout() {
+  LOG(INFO) << "HTMLPageScreen::OnNetworkTimeout";
+  // Just show what we have now. We shouldn't exit from the screen on timeout.
+  OnPageLoaded();
+}
+
+///////////////////////////////////////////////////////////////////////////////
 // HTMLPageScreen, private:
 void HTMLPageScreen::CloseScreen(ScreenObserver::ExitCodes code) {
   StopTimeoutTimer();
diff --git a/chrome/browser/chromeos/login/html_page_screen.h b/chrome/browser/chromeos/login/html_page_screen.h
index 164faee..9e29c64 100644
--- a/chrome/browser/chromeos/login/html_page_screen.h
+++ b/chrome/browser/chromeos/login/html_page_screen.h
@@ -57,6 +57,10 @@ class HTMLPageScreen : public ViewScreen<HTMLPageView>,
   virtual void OnPageLoaded();
   virtual void OnPageLoadFailed(const std::string& url);
 
+ protected:
+  // Overrides WebPageScreen:
+  virtual void OnNetworkTimeout();
+
  private:
   // ViewScreen implementation:
   virtual void CreateView();
diff --git a/chrome/browser/chromeos/login/web_page_screen.h b/chrome/browser/chromeos/login/web_page_screen.h
index 13c074a..c9746bf 100644
--- a/chrome/browser/chromeos/login/web_page_screen.h
+++ b/chrome/browser/chromeos/login/web_page_screen.h
@@ -53,7 +53,7 @@ class WebPageScreen : public TabContentsDelegate {
   virtual bool HandleContextMenu(const ContextMenuParams& params);
 
   // Called by |timeout_timer_|. Stops page fetching and closes screen.
-  void OnNetworkTimeout();
+  virtual void OnNetworkTimeout();
 
   // Start/stop timeout timer.
   void StartTimeoutTimer();