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

Side by Side Diff: chrome/browser/about_flags.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/app/generated_resources.grd ('k') | chrome/browser/browser_process_impl.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/browser/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 2038 matching lines...) Expand 10 before | Expand all | Expand 10 after
2049 IDS_FLAGS_V8_CACHE_OPTIONS_DESCRIPTION, 2049 IDS_FLAGS_V8_CACHE_OPTIONS_DESCRIPTION,
2050 kOsAll, 2050 kOsAll,
2051 MULTI_VALUE_TYPE(kV8CacheOptionsChoices)}, 2051 MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
2052 #if !defined(OS_ANDROID) && !defined(OS_IOS) 2052 #if !defined(OS_ANDROID) && !defined(OS_IOS)
2053 {"enable-md-downloads", 2053 {"enable-md-downloads",
2054 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_DOWNLOADS_NAME, 2054 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_DOWNLOADS_NAME,
2055 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_DOWNLOADS_DESCRIPTION, 2055 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_DOWNLOADS_DESCRIPTION,
2056 kOsDesktop, 2056 kOsDesktop,
2057 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignDownloads)}, 2057 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignDownloads)},
2058 #endif 2058 #endif
2059 #if defined(OS_WIN) 2059 #if defined(OS_WIN) || defined(OS_LINUX)
2060 {"enable-tab-discarding", 2060 {"enable-tab-discarding",
2061 IDS_FLAGS_ENABLE_TAB_DISCARDING_NAME, 2061 IDS_FLAGS_ENABLE_TAB_DISCARDING_NAME,
2062 IDS_FLAGS_ENABLE_TAB_DISCARDING_DESCRIPTION, 2062 IDS_FLAGS_ENABLE_TAB_DISCARDING_DESCRIPTION,
2063 kOsWin, 2063 kOsWin || kOsLinux,
2064 SINGLE_VALUE_TYPE(switches::kEnableTabDiscarding)}, 2064 SINGLE_VALUE_TYPE(switches::kEnableTabDiscarding)},
2065 #endif 2065 #endif
2066 {"enable-clear-browsing-data-counters", 2066 {"enable-clear-browsing-data-counters",
2067 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_NAME, 2067 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_NAME,
2068 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_DESCRIPTION, 2068 IDS_FLAGS_ENABLE_CLEAR_BROWSING_DATA_COUNTERS_DESCRIPTION,
2069 kOsAll, 2069 kOsAll,
2070 SINGLE_VALUE_TYPE(switches::kEnableClearBrowsingDataCounters) 2070 SINGLE_VALUE_TYPE(switches::kEnableClearBrowsingDataCounters)
2071 }, 2071 },
2072 #if defined(ENABLE_TASK_MANAGER) 2072 #if defined(ENABLE_TASK_MANAGER)
2073 {"enable-new-task-manager", 2073 {"enable-new-task-manager",
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
2712 } 2712 }
2713 2713
2714 const Experiment* GetExperiments(size_t* count) { 2714 const Experiment* GetExperiments(size_t* count) {
2715 *count = num_experiments; 2715 *count = num_experiments;
2716 return experiments; 2716 return experiments;
2717 } 2717 }
2718 2718
2719 } // namespace testing 2719 } // namespace testing
2720 2720
2721 } // namespace about_flags 2721 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/browser_process_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698