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

Unified Diff: chrome/app/chrome_main.cc

Issue 6990059: DevTools: devtools message plumbing between worker and page processes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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
« no previous file with comments | « no previous file | chrome/chrome.gyp » ('j') | chrome/chrome_worker.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_main.cc
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index 20de46a062f366245ea247a6aceba15248878fc0..9b7d100a3d4f832c36c3d02d4dcd6102af1f291a 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -34,6 +34,7 @@
#include "chrome/common/profiling.h"
#include "chrome/common/url_constants.h"
#include "chrome/renderer/chrome_content_renderer_client.h"
+#include "chrome/worker/chrome_content_worker_client.h"
#include "content/browser/renderer_host/render_process_host.h"
#include "content/common/content_client.h"
#include "content/common/content_counters.h"
@@ -218,11 +219,17 @@ void EnableHeapProfiler(const CommandLine& command_line) {
#endif
}
+void InitializeChromeContentWorkerClient() {
+ static chrome::ChromeContentWorkerClient chrome_content_worker_client;
+ content::GetContentClient()->set_worker(&chrome_content_worker_client);
+}
+
void InitializeChromeContentRendererClient() {
#if !defined(NACL_WIN64) // We don't build the renderer code on win nacl64.
static chrome::ChromeContentRendererClient chrome_content_renderer_client;
content::GetContentClient()->set_renderer(&chrome_content_renderer_client);
#endif
+ InitializeChromeContentWorkerClient();
jam 2011/05/24 20:21:31 so far, by design we only have one process getter
yurys 2011/05/25 17:28:29 I deleted ContentWorkerClient completely since it'
}
void InitializeChromeContentClient(const std::string& process_type) {
@@ -232,6 +239,8 @@ void InitializeChromeContentClient(const std::string& process_type) {
} else if (process_type == switches::kRendererProcess ||
process_type == switches::kExtensionProcess) {
InitializeChromeContentRendererClient();
+ } else if (process_type == switches::kWorkerProcess) {
+ InitializeChromeContentWorkerClient();
}
}
« no previous file with comments | « no previous file | chrome/chrome.gyp » ('j') | chrome/chrome_worker.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698