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

Unified Diff: chrome/browser/extensions/extension_function_registry.cc

Issue 10445013: Moving web_socket_proxy_private into a sub-dir in api/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixing the order of lines around end-of-header-guard Created 8 years, 7 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
Index: chrome/browser/extensions/extension_function_registry.cc
diff --git a/chrome/browser/extensions/extension_function_registry.cc b/chrome/browser/extensions/extension_function_registry.cc
index 231cfdc0939b57dc6192ec50c350129cec5e2f70..7744f5ff8a3a1af7b692805eda82b5ca2aab40e8 100644
--- a/chrome/browser/extensions/extension_function_registry.cc
+++ b/chrome/browser/extensions/extension_function_registry.cc
@@ -25,6 +25,7 @@
#include "chrome/browser/extensions/api/socket/socket_api.h"
#include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
#include "chrome/browser/extensions/api/web_request/web_request_api.h"
+#include "chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.h"
#include "chrome/browser/extensions/api/webstore_private/webstore_private_api.h"
#include "chrome/browser/extensions/execute_code_in_tab_function.h"
#include "chrome/browser/extensions/extension_chrome_auth_private_api.h"
@@ -43,7 +44,6 @@
#include "chrome/browser/extensions/extension_record_api.h"
#include "chrome/browser/extensions/extension_tabs_module.h"
#include "chrome/browser/extensions/extension_test_api.h"
-#include "chrome/browser/extensions/extension_web_socket_proxy_private_api.h"
#include "chrome/browser/extensions/settings/settings_api.h"
#include "chrome/browser/extensions/system/system_api.h"
#include "chrome/browser/history/history_extension_api.h"
@@ -385,8 +385,9 @@ void ExtensionFunctionRegistry::ResetFunctions() {
#endif
// Websocket to TCP proxy. Currently noop on anything other than ChromeOS.
- RegisterFunction<WebSocketProxyPrivateGetPassportForTCPFunction>();
- RegisterFunction<WebSocketProxyPrivateGetURLForTCPFunction>();
+ RegisterFunction<
+ extensions::WebSocketProxyPrivateGetPassportForTCPFunction>();
+ RegisterFunction<extensions::WebSocketProxyPrivateGetURLForTCPFunction>();
// Debugger
RegisterFunction<AttachDebuggerFunction>();

Powered by Google App Engine
This is Rietveld 408576698