| Index: chrome/browser/chromeos/first_run/drive_first_run_controller.cc
|
| diff --git a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc
|
| index ba5d12b643274578ce393622623f1e2f6350ddc2..e1a657438cf3e773aec2923acf2c97c0584d501b 100644
|
| --- a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc
|
| +++ b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc
|
| @@ -158,12 +158,10 @@ class DriveWebContentsManager : public content::WebContentsObserver,
|
| int error_code,
|
| const base::string16& error_description) OVERRIDE;
|
|
|
| - virtual void DidFailLoad(int64 frame_id,
|
| + virtual void DidFailLoad(content::RenderFrameHost* render_frame_host,
|
| const GURL& validated_url,
|
| - bool is_main_frame,
|
| int error_code,
|
| - const base::string16& error_description,
|
| - content::RenderViewHost* render_view_host) OVERRIDE;
|
| + const base::string16& error_description) OVERRIDE;
|
|
|
| // content::WebContentsDelegate overrides:
|
| virtual bool ShouldCreateWebContents(
|
| @@ -268,13 +266,11 @@ void DriveWebContentsManager::DidFailProvisionalLoad(
|
| }
|
|
|
| void DriveWebContentsManager::DidFailLoad(
|
| - int64 frame_id,
|
| + content::RenderFrameHost* render_frame_host,
|
| const GURL& validated_url,
|
| - bool is_main_frame,
|
| int error_code,
|
| - const base::string16& error_description,
|
| - content::RenderViewHost* render_view_host) {
|
| - if (is_main_frame) {
|
| + const base::string16& error_description) {
|
| + if (!render_frame_host->GetParent()) {
|
| LOG(WARNING) << "Failed to load WebContents to enable offline mode.";
|
| OnOfflineInit(false,
|
| DriveFirstRunController::OUTCOME_WEB_CONTENTS_LOAD_FAILED);
|
|
|