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

Unified Diff: chrome/app/chrome_main.cc

Issue 8113035: Remove RenderProcessHost::is_extension_process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 2 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/app/chrome_main.cc
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index 4d7fbe4dad8be4d2680c27f52fa37f48f368652e..c3c033ff756008a8808c925a34eb291b86958b80 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -234,14 +234,12 @@ static void AdjustLinuxOOMScore(const std::string& process_type) {
// For zygotes and unlabeled process types, we want to still make
// them killable by the OOM killer.
score = kZygoteScore;
- } else if (process_type == switches::kExtensionProcess ||
- process_type == switches::kRendererProcess) {
- LOG(WARNING) << "process type '" << process_type << "' "
+ } else if (process_type == switches::kRendererProcess) {
+ LOG(WARNING) << "process type 'renderer' "
<< "should be created through the zygote.";
- // When debugging, these process types can end up being run
- // directly, but this isn't the typical path for assigning the OOM
- // score for them. Still, we want to assign a score that is
- // somewhat representative for debugging.
+ // When debugging, this process type can end up being run directly, but
+ // this isn't the typical path for assigning the OOM score for it. Still,
+ // we want to assign a score that is somewhat representative for debugging.
score = kRendererScore;
} else {
NOTREACHED() << "Unknown process type";
@@ -273,8 +271,7 @@ void InitializeChromeContentClient(const std::string& process_type) {
} else if (process_type == switches::kPluginProcess) {
content::GetContentClient()->set_plugin(
&g_chrome_content_plugin_client.Get());
- } else if (process_type == switches::kRendererProcess ||
- process_type == switches::kExtensionProcess) {
+ } else if (process_type == switches::kRendererProcess) {
InitializeChromeContentRendererClient();
} else if (process_type == switches::kUtilityProcess) {
content::GetContentClient()->set_utility(
@@ -300,7 +297,6 @@ bool SubprocessNeedsResourceBundle(const std::string& process_type) {
process_type == switches::kWorkerProcess ||
#endif
process_type == switches::kRendererProcess ||
- process_type == switches::kExtensionProcess ||
process_type == switches::kUtilityProcess;
}
@@ -315,8 +311,6 @@ void SetMacProcessName(const std::string& process_type) {
} else if (process_type == switches::kPluginProcess ||
process_type == switches::kPpapiPluginProcess) {
name_id = IDS_PLUGIN_APP_NAME;
- } else if (process_type == switches::kExtensionProcess) {
- name_id = IDS_WORKER_APP_NAME;
jam 2011/10/04 16:59:22 do we want to use this in the "process_type == swi
jochen (gone - plz use gerrit) 2011/10/04 18:50:19 Done.
} else if (process_type == switches::kUtilityProcess) {
name_id = IDS_UTILITY_APP_NAME;
}
@@ -646,9 +640,6 @@ class ChromeMainDelegate : public content::ContentMainDelegate {
const std::string& process_type,
const MainFunctionParams& main_function_params) OVERRIDE {
static const MainFunction kMainFunctions[] = {
- // An extension process is just a renderer process. We use a different
- // command line argument to differentiate crash reports.
- { switches::kExtensionProcess, RendererMain },
{ switches::kServiceProcess, ServiceProcessMain },
#if defined(OS_MACOSX)
{ switches::kRelauncherProcess,
@@ -683,8 +674,7 @@ class ChromeMainDelegate : public content::ContentMainDelegate {
#if defined(OS_MACOSX)
virtual bool ProcessRegistersWithSystemProcess(
const std::string& process_type) OVERRIDE {
- return process_type == switches::kNaClLoaderProcess ||
- process_type == switches::kExtensionProcess;
+ return process_type == switches::kNaClLoaderProcess;
}
virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE {
@@ -694,11 +684,9 @@ class ChromeMainDelegate : public content::ContentMainDelegate {
virtual bool DelaySandboxInitialization(
const std::string& process_type) OVERRIDE {
- // Extensions are really renderers.
// NaClLoader does this in NaClMainPlatformDelegate::EnableSandbox().
// No sandbox needed for relauncher.
- return process_type == switches::kExtensionProcess ||
- process_type == switches::kNaClLoaderProcess ||
+ return process_type == switches::kNaClLoaderProcess ||
process_type == switches::kRelauncherProcess;
}
#elif defined(OS_POSIX)

Powered by Google App Engine
This is Rietveld 408576698