Use the correct signal to detect failed navigations

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2010 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/tab_contents/tab_contents.h"
 
 #include <cmath>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 2125 matching lines @@
 }
 
 void TabContents::DidStartProvisionalLoadForFrame(
     RenderViewHost* render_view_host,
     int64 frame_id,
     bool is_main_frame,
     bool is_error_page,
     const GURL& url) {
   ProvisionalLoadDetails details(is_main_frame,
                                  controller_.IsURLInPageNavigation(url),
-                                 url, std::string(), false, frame_id);
+                                 url, std::string(), false,
+                                 is_error_page, frame_id);
   NotificationService::current()->Notify(
       NotificationType::FRAME_PROVISIONAL_LOAD_START,
       Source<NavigationController>(&controller_),
       Details<ProvisionalLoadDetails>(&details));
   if (is_main_frame) {
     // If we're displaying a network error page do not reset the content
     // settings delegate's cookies so the user has a chance to modify cookie
     // settings.
     if (!is_error_page)
       content_settings_delegate_->ClearCookieSpecificContentSettings();
@@ skipping 88 matching lines @@
       // Update the URL display.
       NotifyNavigationStateChanged(TabContents::INVALIDATE_URL);
     }
 
     render_manager_.RendererAbortedProvisionalLoad(render_view_host);
   }
 
   // Send out a notification that we failed a provisional load with an error.
   ProvisionalLoadDetails details(is_main_frame,
                                  controller_.IsURLInPageNavigation(url),
-                                 url, std::string(), false, frame_id);
+                                 url, std::string(), false, false, frame_id);

[yzshen, 2010/12/01 18:21:53]

I am not sure I understand this correctly.

Is FRAME_PROVISIONAL_LOAD_START the only event that carries a valid
is_error_page field?

[Matt Perry, 2010/12/01 20:51:10]

I'm also a little confused. Do we not get a "committed" event for the error
page?

   details.set_error_code(error_code);
 
   NotificationService::current()->Notify(
       NotificationType::FAIL_PROVISIONAL_LOAD_WITH_ERROR,
       Source<NavigationController>(&controller_),
       Details<ProvisionalLoadDetails>(&details));
 }
 
 void TabContents::DocumentLoadedInFrame(int64 frame_id) {
   controller_.DocumentLoadedInFrame();
@@ skipping 219 matching lines @@
   // different from the NAV_ENTRY_COMMITTED notification which doesn't include
   // the actual URL navigated to and isn't sent for AUTO_SUBFRAME navigations.
   if (details.type != NavigationType::NAV_IGNORE) {
     // For AUTO_SUBFRAME navigations, an event for the main frame is generated
     // that is not recorded in the navigation history. For the purpose of
     // tracking navigation events, we treat this event as a sub frame navigation
     // event.
     bool is_main_frame = did_navigate ? details.is_main_frame : false;
     ProvisionalLoadDetails load_details(
         is_main_frame, details.is_in_page, params.url, std::string(), false,
-        params.frame_id);
+        false, params.frame_id);
     load_details.set_transition_type(params.transition);
     // Whether or not a page transition was triggered by going backward or
     // forward in the history is only stored in the navigation controller's
     // entry list.
     if (did_navigate &&
         (controller_.GetActiveEntry()->transition_type() &
             PageTransition::FORWARD_BACK)) {
       load_details.set_transition_type(
           params.transition | PageTransition::FORWARD_BACK);
     }
@@ skipping 739 matching lines @@
 }
 
 void TabContents::set_encoding(const std::string& encoding) {
   encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding);
 }
 
 void TabContents::SetAppIcon(const SkBitmap& app_icon) {
   app_icon_ = app_icon;
   NotifyNavigationStateChanged(INVALIDATE_TITLE);
 }