Add the onBeforeNavigate and onErrorOccured events to the webNavigation API.

Also, rewrite the onCommitted event such that AUTO_SUBFRAME events are also registered.

The frameId and the requestId fields are still unimplemented.

Also, there occur navigation events after an error is reported.

BUG=50943
TEST=WebNavigationEvents

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

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

2 files changed, 92 insertions, 19 deletions

diff --git a/chrome/browser/extensions/extension_webnavigation_api.cc b/chrome/browser/extensions/extension_webnavigation_api.cc
index 4a545fd..de2442f 100644
--- a/chrome/browser/extensions/extension_webnavigation_api.cc
+++ b/chrome/browser/extensions/extension_webnavigation_api.cc
@@ -13,9 +13,11 @@
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extension_webnavigation_api_constants.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/provisional_load_details.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/notification_service.h"
+#include "net/base/net_errors.h"
 
 namespace keys = extension_webnavigation_api_constants;
 
@@ -28,7 +30,13 @@ ExtensionWebNavigationEventRouter::GetInstance() {
 void ExtensionWebNavigationEventRouter::Init() {
   if (registrar_.IsEmpty()) {
     registrar_.Add(this,
-                   NotificationType::NAV_ENTRY_COMMITTED,
+                   NotificationType::FRAME_PROVISIONAL_LOAD_START,
+                   NotificationService::AllSources());
+    registrar_.Add(this,
+                   NotificationType::FRAME_PROVISIONAL_LOAD_COMMITTED,
+                   NotificationService::AllSources());
+    registrar_.Add(this,
+                   NotificationType::FAIL_PROVISIONAL_LOAD_WITH_ERROR,
                    NotificationService::AllSources());
   }
 }
@@ -38,35 +46,64 @@ void ExtensionWebNavigationEventRouter::Observe(
     const NotificationSource& source,
     const NotificationDetails& details) {
   switch (type.value) {
-    case NotificationType::NAV_ENTRY_COMMITTED:
-      NavEntryCommitted(
+    case NotificationType::FRAME_PROVISIONAL_LOAD_START:
+      FrameProvisionalLoadStart(
+          Source<NavigationController>(source).ptr(),
+          Details<ProvisionalLoadDetails>(details).ptr());
+      break;
+    case NotificationType::FRAME_PROVISIONAL_LOAD_COMMITTED:
+      FrameProvisionalLoadCommitted(
+          Source<NavigationController>(source).ptr(),
+          Details<ProvisionalLoadDetails>(details).ptr());
+      break;
+    case NotificationType::FAIL_PROVISIONAL_LOAD_WITH_ERROR:
+      FailProvisionalLoadWithError(
           Source<NavigationController>(source).ptr(),
-          Details<NavigationController::LoadCommittedDetails>(details).ptr());
+          Details<ProvisionalLoadDetails>(details).ptr());
       break;
 
     default:
       NOTREACHED();
   }
 }
+void ExtensionWebNavigationEventRouter::FrameProvisionalLoadStart(
+    NavigationController* controller,
+    ProvisionalLoadDetails* details) {
+  ListValue args;
+  DictionaryValue* dict = new DictionaryValue();
+  dict->SetInteger(keys::kTabIdKey,
+                   ExtensionTabUtil::GetTabId(controller->tab_contents()));
+  dict->SetString(keys::kUrlKey,
+                  details->url().spec());
+  dict->SetInteger(keys::kFrameIdKey, 0);
+  dict->SetInteger(keys::kRequestIdKey, 0);
+  dict->SetReal(keys::kTimeStampKey,
+                (base::Time::Now() - base::Time::UnixEpoch()).InMilliseconds());
+  args.Append(dict);
 
-void ExtensionWebNavigationEventRouter::NavEntryCommitted(
+  std::string json_args;
+  base::JSONWriter::Write(&args, false, &json_args);
+  DispatchEvent(controller->profile(), keys::kOnBeforeNavigate, json_args);
+}
+
+void ExtensionWebNavigationEventRouter::FrameProvisionalLoadCommitted(
     NavigationController* controller,
-    NavigationController::LoadCommittedDetails* details) {
+    ProvisionalLoadDetails* details) {
   ListValue args;
   DictionaryValue* dict = new DictionaryValue();
   dict->SetInteger(keys::kTabIdKey,
                    ExtensionTabUtil::GetTabId(controller->tab_contents()));
   dict->SetString(keys::kUrlKey,
-                  details->entry->url().spec());
-  dict->SetInteger(keys::kFrameIdKey,
-                   details->is_main_frame ? 0 : details->entry->page_id());
+                  details->url().spec());
+  dict->SetInteger(keys::kFrameIdKey, 0);
   dict->SetString(keys::kTransitionTypeKey,
                   PageTransition::CoreTransitionString(
-                      details->entry->transition_type()));
+                      details->transition_type()));
   dict->SetString(keys::kTransitionQualifiersKey,
                   PageTransition::QualifierString(
-                      details->entry->transition_type()));
-  dict->SetReal(keys::kTimeStampKey, base::Time::Now().ToDoubleT());
+                      details->transition_type()));
+  dict->SetReal(keys::kTimeStampKey,
+                (base::Time::Now() - base::Time::UnixEpoch()).InMilliseconds());
   args.Append(dict);
 
   std::string json_args;
@@ -74,6 +111,27 @@ void ExtensionWebNavigationEventRouter::NavEntryCommitted(
   DispatchEvent(controller->profile(), keys::kOnCommitted, json_args);
 }
 
+void ExtensionWebNavigationEventRouter::FailProvisionalLoadWithError(
+    NavigationController* controller,
+    ProvisionalLoadDetails* details) {
+  ListValue args;
+  DictionaryValue* dict = new DictionaryValue();
+  dict->SetInteger(keys::kTabIdKey,
+                   ExtensionTabUtil::GetTabId(controller->tab_contents()));
+  dict->SetString(keys::kUrlKey,
+                  details->url().spec());
+  dict->SetInteger(keys::kFrameIdKey, 0);
+  dict->SetString(keys::kErrorKey,
+                  std::string(net::ErrorToString(details->error_code())));
+  dict->SetReal(keys::kTimeStampKey,
+                (base::Time::Now() - base::Time::UnixEpoch()).InMilliseconds());
+  args.Append(dict);
+
+  std::string json_args;
+  base::JSONWriter::Write(&args, false, &json_args);
+  DispatchEvent(controller->profile(), keys::kOnErrorOccurred, json_args);
+}
+
 void ExtensionWebNavigationEventRouter::DispatchEvent(
     Profile* profile,
     const char* event_name,
diff --git a/chrome/browser/extensions/extension_webnavigation_api.h b/chrome/browser/extensions/extension_webnavigation_api.h
index 77182e1..95ba032 100644
--- a/chrome/browser/extensions/extension_webnavigation_api.h
+++ b/chrome/browser/extensions/extension_webnavigation_api.h
@@ -12,10 +12,13 @@
 
 #include "base/singleton.h"
 #include "chrome/browser/extensions/extension_function.h"
-#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 
+class NavigationController;
+class ProvisionalLoadDetails;
+
 // Observes navigation notifications and routes them as events to the extension
 // system.
 class ExtensionWebNavigationEventRouter : public NotificationObserver {
@@ -36,11 +39,23 @@ class ExtensionWebNavigationEventRouter : public NotificationObserver {
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  // Handler for the NAV_ENTRY_COMMITTED event. The method takes the details of
-  // such an event and constructs a suitable JSON formatted extension event
-  // from it.
-  void NavEntryCommitted(NavigationController* controller,
-                         NavigationController::LoadCommittedDetails* details);
+  // Handler for the FRAME_PROVISIONAL_LOAD_START event. The method takes the
+  // details of such an event and constructs a suitable JSON formatted extension
+  // event from it.
+  void FrameProvisionalLoadStart(NavigationController* controller,
+                                 ProvisionalLoadDetails* details);
+
+  // Handler for the FRAME_PROVISIONAL_LOAD_COMMITTED event. The method takes
+  // the details of such an event and constructs a suitable JSON formatted
+  // extension event from it.
+  void FrameProvisionalLoadCommitted(NavigationController* controller,
+                                     ProvisionalLoadDetails* details);
+
+  // Handler for the FAIL_PROVISIONAL_LOAD_WITH_ERROR event. The method takes
+  // the details of such an event and constructs a suitable JSON formatted
+  // extension event from it.
+  void FailProvisionalLoadWithError(NavigationController* controller,
+                                    ProvisionalLoadDetails* details);
 
   // This method dispatches events to the extension message service.
   void DispatchEvent(Profile* context,