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

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 1862513003: Remove NPAPI from browser and utility (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 | « chrome/app/chrome_crash_reporter_client.cc ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index d3626f95f445575912282aef6fa8eb0c3c869917..b063966b42984d86e0c4c5723a650d827c46cabd 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -230,8 +230,7 @@ static void AdjustLinuxOOMScore(const std::string& process_type) {
DCHECK(kMiscScore > 0);
DCHECK(kPluginScore > 0);
- if (process_type == switches::kPluginProcess ||
- process_type == switches::kPpapiPluginProcess) {
+ if (process_type == switches::kPpapiPluginProcess) {
score = kPluginScore;
} else if (process_type == switches::kPpapiBrokerProcess) {
// The broker should be killed before the PPAPI plugin.
@@ -269,11 +268,6 @@ static void AdjustLinuxOOMScore(const std::string& process_type) {
// and resources loaded.
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
return
-#if defined(OS_WIN) || defined(OS_MACOSX)
- // Windows needs resources for the default/null plugin.
- // Mac needs them for the plugin process name.
- process_type == switches::kPluginProcess ||
-#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX)
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
« no previous file with comments | « chrome/app/chrome_crash_reporter_client.cc ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698