Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4548)

Unified Diff: chrome/browser/chromeos/first_run/drive_first_run_controller.cc

Issue 373623002: Convert remaining WebContentsObservers loading callbacks to use RFH. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix one more compile error Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/android/meta_tag_observer.cc ('k') | chrome/browser/dom_distiller/tab_utils_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « chrome/browser/android/meta_tag_observer.cc ('k') | chrome/browser/dom_distiller/tab_utils_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698