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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 1332003002: Add option to disallow the discarding of a tab that was previously discarded. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sky@ and rkaplow@ comments. Created 5 years, 3 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/browser/memory/oom_priority_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 87ec5c0c462e513212928d1725d657302f2aab6f..37f2dcc02276d3f0cdeb5feeeac7456656a8f668 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1162,13 +1162,15 @@ void ChromeBrowserMainParts::PreBrowserStart() {
// On CrOS, it is always enabled. On other platforms, it's behind a flag for
// now.
#if defined(OS_CHROMEOS)
- g_browser_process->GetOomPriorityManager()->Start();
+ g_browser_process->GetOomPriorityManager()->Start(false);
#elif defined(OS_WIN) || defined(OS_MACOSX)
const std::string group_name =
base::FieldTrialList::FindFullName("AutomaticTabDiscarding");
if (parsed_command_line().HasSwitch(switches::kEnableTabDiscarding) ||
base::StartsWith(group_name, "Enabled", base::CompareCase::SENSITIVE)) {
- g_browser_process->GetOomPriorityManager()->Start();
+ bool enabled_once = base::StartsWith(group_name, "Enabled_Once",
+ base::CompareCase::SENSITIVE);
+ g_browser_process->GetOomPriorityManager()->Start(enabled_once);
}
#endif
}
« no previous file with comments | « no previous file | chrome/browser/memory/oom_priority_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698