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

Side by Side Diff: chrome/common/chrome_switches.cc

Issue 1257543004: Add oom tab killing and the about:discards page on linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@memoryPressureOnLinux
Patch Set: Created 5 years, 5 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 unified diff | Download patch
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/chrome_switches.h" 5 #include "chrome/common/chrome_switches.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 9
10 namespace switches { 10 namespace switches {
(...skipping 1268 matching lines...) Expand 10 before | Expand all | Expand 10 after
1279 const char kMetricsClientID[] = "metrics-client-id"; 1279 const char kMetricsClientID[] = "metrics-client-id";
1280 1280
1281 // A process type (switches::kProcessType) that relaunches the browser. See 1281 // A process type (switches::kProcessType) that relaunches the browser. See
1282 // chrome/browser/mac/relauncher.h. 1282 // chrome/browser/mac/relauncher.h.
1283 const char kRelauncherProcess[] = "relauncher"; 1283 const char kRelauncherProcess[] = "relauncher";
1284 #endif // defined(OS_MACOSX) 1284 #endif // defined(OS_MACOSX)
1285 1285
1286 // Use bubbles for content permissions requests instead of infobars. 1286 // Use bubbles for content permissions requests instead of infobars.
1287 const char kEnablePermissionsBubbles[] = "enable-permissions-bubbles"; 1287 const char kEnablePermissionsBubbles[] = "enable-permissions-bubbles";
1288 1288
1289 #if defined(OS_WIN) || defined(OS_LINUX)
1290 // Enable tab discarding when system is under memory pressure.
1291 const char kEnableTabDiscarding[] = "enable-tab-discarding";
1292 #endif
1293
1289 #if defined(OS_WIN) 1294 #if defined(OS_WIN)
1290 // Fallback to XPS. By default connector uses CDD. 1295 // Fallback to XPS. By default connector uses CDD.
1291 const char kEnableCloudPrintXps[] = "enable-cloud-print-xps"; 1296 const char kEnableCloudPrintXps[] = "enable-cloud-print-xps";
1292 1297
1293 // Force-enables the profile shortcut manager. This is needed for tests since 1298 // Force-enables the profile shortcut manager. This is needed for tests since
1294 // they use a custom-user-data-dir which disables this. 1299 // they use a custom-user-data-dir which disables this.
1295 const char kEnableProfileShortcutManager[] = "enable-profile-shortcut-manager"; 1300 const char kEnableProfileShortcutManager[] = "enable-profile-shortcut-manager";
1296 1301
1297 // Enable tab discarding when system is under memory pressure.
1298 const char kEnableTabDiscarding[] = "enable-tab-discarding";
1299
1300 // For the DelegateExecute verb handler to launch Chrome in metro mode on 1302 // For the DelegateExecute verb handler to launch Chrome in metro mode on
1301 // Windows 8 and higher. Used when relaunching metro Chrome. 1303 // Windows 8 and higher. Used when relaunching metro Chrome.
1302 const char kForceImmersive[] = "force-immersive"; 1304 const char kForceImmersive[] = "force-immersive";
1303 1305
1304 // Whether or not the browser should warn if the profile is on a network share. 1306 // Whether or not the browser should warn if the profile is on a network share.
1305 // This flag is only relevant for Windows currently. 1307 // This flag is only relevant for Windows currently.
1306 const char kNoNetworkProfileWarning[] = "no-network-profile-warning"; 1308 const char kNoNetworkProfileWarning[] = "no-network-profile-warning";
1307 1309
1308 // For the DelegateExecute verb handler to launch Chrome in desktop mode on 1310 // For the DelegateExecute verb handler to launch Chrome in desktop mode on
1309 // Windows 8 and higher. Used when relaunching metro Chrome. 1311 // Windows 8 and higher. Used when relaunching metro Chrome.
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1410 1412
1411 // ----------------------------------------------------------------------------- 1413 // -----------------------------------------------------------------------------
1412 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 1414 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
1413 // 1415 //
1414 // You were going to just dump your switches here, weren't you? Instead, please 1416 // You were going to just dump your switches here, weren't you? Instead, please
1415 // put them in alphabetical order above, or in order inside the appropriate 1417 // put them in alphabetical order above, or in order inside the appropriate
1416 // ifdef at the bottom. The order should match the header. 1418 // ifdef at the bottom. The order should match the header.
1417 // ----------------------------------------------------------------------------- 1419 // -----------------------------------------------------------------------------
1418 1420
1419 } // namespace switches 1421 } // namespace switches
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698