Implement the webNavigation.onCommitted event.

BUG=50943
TEST=ExtensionApiTest.WebNavigationEvents

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

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

4 files changed, 27 insertions, 4 deletions

diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
index 0ca4808..4727108 100644
--- a/chrome/common/extensions/api/extension_api.json
+++ b/chrome/common/extensions/api/extension_api.json
@@ -3192,7 +3192,7 @@
               "url": {"type": "string"},
               "frameId": {"type": "integer", "description": "0 indicates the navigation happens in the tab content window; positive value indicates navigation in a subframe."},
               "transitionType": {"type": "string", "enum": ["link", "typed", "auto_bookmark", "auto_subframe", "manual_subframe", "generated", "start_page", "form_submit", "reload", "keyword", "keyword_generated"], "description": "Cause of the navigation. The same transition types as defined in the history API are used."},
-              "transitionQualifiers": {"type": "string", "enum": ["client_redirect", "server_redirect", "forward_back"], "description": "Zero or more transition qualifiers delimited by \"|\". Possible qualifiers are \"client_redirect\", \"server_redirect\", and \"forward_backward\"."},
+              "transitionQualifiers": {"type": "string", "description": "Zero or more transition qualifiers delimited by \"|\". Possible qualifiers are \"client_redirect\", \"server_redirect\", and \"forward_back\"."},
               "timeStamp": {"type": "number", "description": "The time when the navigation was committed, in milliseconds since the epoch."}
             }
           }
diff --git a/chrome/common/extensions/docs/experimental.webNavigation.html b/chrome/common/extensions/docs/experimental.webNavigation.html
index ee897d5..b71aac33 100644
--- a/chrome/common/extensions/docs/experimental.webNavigation.html
+++ b/chrome/common/extensions/docs/experimental.webNavigation.html
@@ -1392,7 +1392,7 @@
                 <div style="display:inline">
                   (
                     <span class="optional" style="display: none; ">optional</span>
-                    <span class="enum">enumerated</span>
+                    <span class="enum" style="display: none; ">enumerated</span>
                     <span id="typeTemplate">
                       <span style="display: none; ">
                         <a> Type</a>
@@ -1402,7 +1402,7 @@
                           array of <span><span></span></span>
                         </span>
                         <span>string</span>
-                        <span>["client_redirect", "server_redirect", "forward_back"]</span>
+                        <span style="display: none; "></span>
                       </span>
                     </span>
                   )
@@ -1413,7 +1413,7 @@
           <dd class="todo" style="display: none; ">
             Undocumented.
           </dd>
-          <dd>Zero or more transition qualifiers delimited by "|". Possible qualifiers are "client_redirect", "server_redirect", and "forward_backward".</dd>
+          <dd>Zero or more transition qualifiers delimited by "|". Possible qualifiers are "client_redirect", "server_redirect", and "forward_back".</dd>
           <dd style="display: none; ">
             This parameter was added in version
             <b><span></span></b>.
diff --git a/chrome/common/page_transition_types.cc b/chrome/common/page_transition_types.cc
index bf686f9..1079ea0 100644
--- a/chrome/common/page_transition_types.cc
+++ b/chrome/common/page_transition_types.cc
@@ -34,3 +34,20 @@ const char* PageTransition::CoreTransitionString(Type type) {
   }
   return NULL;
 }
+
+// static
+const char* PageTransition::QualifierString(Type type) {
+  DCHECK_NE((int)(type & (CLIENT_REDIRECT | SERVER_REDIRECT)),
+            (int)(CLIENT_REDIRECT | SERVER_REDIRECT));
+
+  switch (type & (CLIENT_REDIRECT | SERVER_REDIRECT | FORWARD_BACK)) {
+    case CLIENT_REDIRECT: return "client_redirect";
+    case SERVER_REDIRECT: return "server_redirect";
+    case FORWARD_BACK:    return "forward_back";
+    case (CLIENT_REDIRECT | FORWARD_BACK):
+                          return "client_redirect|forward_back";
+    case (SERVER_REDIRECT | FORWARD_BACK):
+                          return "server_redirect|forward_back";
+  }
+  return "";
+}
diff --git a/chrome/common/page_transition_types.h b/chrome/common/page_transition_types.h
index 71cd386..8ca7042 100644
--- a/chrome/common/page_transition_types.h
+++ b/chrome/common/page_transition_types.h
@@ -102,6 +102,9 @@ class PageTransition {
     // Any of the core values above can be augmented by one or more qualifiers.
     // These qualifiers further define the transition.
 
+    // User used the Forward or Back button to navigate among browsing history.
+    FORWARD_BACK = 0x01000000,
+
     // The beginning of a navigation chain.
     CHAIN_START = 0x10000000,
 
@@ -157,6 +160,9 @@ class PageTransition {
 
   // Return a string version of the core type values.
   static const char* CoreTransitionString(Type type);
+
+  // Return a string version of the qualifier type values.
+  static const char* QualifierString(Type type);
 };
 
 #endif  // CHROME_COMMON_PAGE_TRANSITION_TYPES_H__