3 files changed, 15 insertions, 0 deletions
diff --git a/content/browser/browser_thread.cc b/content/browser/browser_thread.cc
index f02f313..47b7861 100644
--- a/content/browser/browser_thread.cc
+++ b/content/browser/browser_thread.cc
@@ -21,6 +21,9 @@ static const char* browser_thread_names[BrowserThread::ID_COUNT] = {
 #if defined(USE_X11)
   "Chrome_Background_X11Thread",  // BACKGROUND_X11
 #endif
+#if defined(OS_CHROMEOS)
+  "Chrome_WebSocketproxyThread",  // WEB_SOCKET_PROXY
+#endif
 };
 
 // An implementation of MessageLoopProxy to be used in conjunction
diff --git a/content/browser/browser_thread.h b/content/browser/browser_thread.h
index b54f5fe..680c25a 100644
--- a/content/browser/browser_thread.h
+++ b/content/browser/browser_thread.h
@@ -75,6 +75,13 @@ class BrowserThread : public base::Thread {
     BACKGROUND_X11,
 #endif
 
+#if defined(OS_CHROMEOS)
+    // This thread runs websocket to TCP proxy.
+    // TODO(dilmah): remove this thread, instead implement this functionality
+    // as hooks into websocket layer.
+    WEB_SOCKET_PROXY,
+#endif
+
     // This identifier does not represent a thread.  Instead it counts the
     // number of well-known threads.  Insert new well-known threads before this
     // identifier.
diff --git a/content/common/notification_type.h b/content/common/notification_type.h
index 1744081..9b9ab0d 100644
--- a/content/common/notification_type.h
+++ b/content/common/notification_type.h
@@ -1283,6 +1283,11 @@ class NotificationType {
     // Sent when the applications in the NTP app launcher have been reordered.
     EXTENSION_LAUNCHER_REORDERED,
 
+#if defined(OS_CHROMEOS)
+    // Sent when WebSocketProxy started accepting connections.
+    WEB_SOCKET_PROXY_STARTED,
+#endif
+
     // Sent when a new web store promo has been loaded.
     WEB_STORE_PROMO_LOADED,