Add api constants for webRequest and clean up webNavigation.

BUG=50943
TEST=none

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

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

5 files changed, 76 insertions, 10 deletions

diff --git a/chrome/browser/extensions/extension_web_navigation_api_constants.cc b/chrome/browser/extensions/extension_webnavigation_api_constants.cc
index b4e91c4..e84289f 100644
--- a/chrome/browser/extensions/extension_web_navigation_api_constants.cc
+++ b/chrome/browser/extensions/extension_webnavigation_api_constants.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/extensions/extension_web_navigation_api_constants.h"
+#include "chrome/browser/extensions/extension_webnavigation_api_constants.h"
 
-namespace extension_web_navigation_api_constants {
+namespace extension_webnavigation_api_constants {
 
 const char kErrorKey[] = "error";
 const char kFrameIdKey[] = "frameId";
@@ -15,6 +15,7 @@ const char kTabIdKey[] = "tabId";
 const char kTargetUrlKey[] = "targetUrl";
 const char kTimeStampKey[] = "timeStamp";
 const char kTransitionTypeKey[] = "transitionType";
+const char kTransitionQualifiersKey[] = "transitionQualifiers";
 const char kUrlKey[] = "url";
 
 const char kOnBeforeNavigate[] = "experimental.webNavigation.onBeforeNavigate";
@@ -25,4 +26,4 @@ const char kOnDOMContentLoaded[] =
     "experimental.webNavigation.onDOMContentLoaded";
 const char kOnErrorOccurred[] = "experimental.webNavigation.onErrorOccurred";
 
-}  // namespace extension_web_navigation_api_constants
+}  // namespace extension_webnavigation_api_constants
diff --git a/chrome/browser/extensions/extension_web_navigation_api_constants.h b/chrome/browser/extensions/extension_webnavigation_api_constants.h
index 8b19734..7956ccd 100644
--- a/chrome/browser/extensions/extension_web_navigation_api_constants.h
+++ b/chrome/browser/extensions/extension_webnavigation_api_constants.h
@@ -4,11 +4,11 @@
 
 // Constants used for the WebNavigation API.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_WEB_NAVIGATION_API_CONSTANTS_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_WEB_NAVIGATION_API_CONSTANTS_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBNAVIGATION_API_CONSTANTS_H_
+#define CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBNAVIGATION_API_CONSTANTS_H_
 #pragma once
 
-namespace extension_web_navigation_api_constants {
+namespace extension_webnavigation_api_constants {
 
 // Keys.
 extern const char kErrorKey[];
@@ -20,6 +20,7 @@ extern const char kTabIdKey[];
 extern const char kTargetUrlKey[];
 extern const char kTimeStampKey[];
 extern const char kTransitionTypeKey[];
+extern const char kTransitionQualifiersKey[];
 extern const char kUrlKey[];
 
 // Events.
@@ -30,6 +31,6 @@ extern const char kOnCompleted[];
 extern const char kOnDOMContentLoaded[];
 extern const char kOnErrorOccurred[];
 
-}  // namespace extension_web_navigation_api_constants
+}  // namespace extension_webnavigation_api_constants
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_WEB_NAVIGATION_API_CONSTANTS_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBNAVIGATION_API_CONSTANTS_H_
diff --git a/chrome/browser/extensions/extension_webrequest_api_constants.cc b/chrome/browser/extensions/extension_webrequest_api_constants.cc
new file mode 100644
index 0000000..38ad85d
--- /dev/null
+++ b/chrome/browser/extensions/extension_webrequest_api_constants.cc
@@ -0,0 +1,27 @@
+// 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/extensions/extension_webrequest_api_constants.h"
+
+namespace extension_webrequest_api_constants {
+
+const char kErrorKey[] = "error";
+const char kIpKey[] = "ip";
+const char kMethodKey[] = "method";
+const char kRedirectUrlKey[] = "redirectUrl";
+const char kRequestIdKey[] = "requestId";
+const char kStatusCodeKey[] = "statusCode";
+const char kTabIdKey[] = "tabId";
+const char kTimeStampKey[] = "timeStamp";
+const char kTypeKey[] = "type";
+const char kUrlKey[] = "url";
+
+const char kOnBeforeRedirect[] = "experimental.webRequest.onBeforeRedirect";
+const char kOnBeforeRequest[] = "experimental.webRequest.onBeforeRequest";
+const char kOnCompleted[] = "experimental.webRequest.onCompleted";
+const char kOnErrorOccurred[] = "experimental.webRequest.onErrorOccurred";
+const char kOnHeadersReceived[] = "experimental.webRequest.onHeadersReceived";
+const char kOnRequestSent[] = "experimental.webRequest.onRequestSent";
+
+}  // namespace extension_webrequest_api_constants
diff --git a/chrome/browser/extensions/extension_webrequest_api_constants.h b/chrome/browser/extensions/extension_webrequest_api_constants.h
new file mode 100644
index 0000000..8e5a218
--- /dev/null
+++ b/chrome/browser/extensions/extension_webrequest_api_constants.h
@@ -0,0 +1,35 @@
+// 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.
+
+// Constants used for the WebRequest API.
+
+#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBREQUEST_API_CONSTANTS_H_
+#define CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBREQUEST_API_CONSTANTS_H_
+#pragma once
+
+namespace extension_webrequest_api_constants {
+
+// Keys.
+extern const char kErrorKey[];
+extern const char kIpKey[];
+extern const char kMethodKey[];
+extern const char kRedirectUrlKey[];
+extern const char kRequestIdKey[];
+extern const char kStatusCodeKey[];
+extern const char kTabIdKey[];
+extern const char kTimeStampKey[];
+extern const char kTypeKey[];
+extern const char kUrlKey[];
+
+// Events.
+extern const char kOnBeforeRedirect[];
+extern const char kOnBeforeRequest[];
+extern const char kOnCompleted[];
+extern const char kOnErrorOccurred[];
+extern const char kOnHeadersReceived[];
+extern const char kOnRequestSent[];
+
+}  // namespace extension_webrequest_api_constants
+
+#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBREQUEST_API_CONSTANTS_H_
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 354feab..0967503 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1451,8 +1451,10 @@
         'browser/extensions/extension_toolbar_model.h',
         'browser/extensions/extension_updater.cc',
         'browser/extensions/extension_updater.h',
-        'browser/extensions/extension_web_navigation_api_constants.cc',
-        'browser/extensions/extension_web_navigation_api_constants.h',
+        'browser/extensions/extension_webrequest_api_constants.cc',
+        'browser/extensions/extension_webrequest_api_constants.h',
+        'browser/extensions/extension_webnavigation_api_constants.cc',
+        'browser/extensions/extension_webnavigation_api_constants.h',
         'browser/extensions/extension_webstore_private_api.cc',
         'browser/extensions/extension_webstore_private_api.h',
         'browser/extensions/extensions_quota_service.cc',