summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser.gypi
diff options
context:
space:
mode:
authorgspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 01:20:30 +0000
committergspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-04 01:20:30 +0000
commit5d4dc8a5c5f9dd43a637bc09645289055accbfb7 (patch)
tree663d5d15a5af024c50f8ed5cc468845d9f919692 /chrome/chrome_browser.gypi
parentcd8d237c83f5fcd1fc0d06e9fdd840fb4e24ac94 (diff)
downloadchromium_src-5d4dc8a5c5f9dd43a637bc09645289055accbfb7.zip
chromium_src-5d4dc8a5c5f9dd43a637bc09645289055accbfb7.tar.gz
chromium_src-5d4dc8a5c5f9dd43a637bc09645289055accbfb7.tar.bz2
Adding OOM priority management for renderers on ChromeOS.
[I actually did this two months ago, and though I had committed it, but due to the "git cl push" vs "git cl dcommit" craziness, it was never in the tree.] It was previously reviewed and LGTM'd here: http://codereview.chromium.org/3235007/show BUG=none TEST=Tested on device, both using large numbers of tabs, and small tabs that used lots of memory. Review URL: http://codereview.chromium.org/4446002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
-rw-r--r--chrome/chrome_browser.gypi6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 8797a88..6091b69 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2319,6 +2319,8 @@
'browser/ntp_background_util.h',
'browser/omnibox_search_hint.cc',
'browser/omnibox_search_hint.h',
+ 'browser/oom_priority_manager.cc',
+ 'browser/oom_priority_manager.h',
'browser/options_page_base.cc',
'browser/options_page_base.h',
'browser/options_util.cc',
@@ -3384,6 +3386,8 @@
['exclude', 'browser/dom_ui/mediaplayer_ui.cc'],
['exclude', 'browser/dom_ui/slideshow_ui.cc'],
['exclude', 'browser/extensions/extension_tts_api_chromeos.cc'],
+ ['exclude', 'browser/oom_priority_manager.cc'],
+ ['exclude', 'browser/oom_priority_manager.h'],
['exclude', 'browser/renderer_host/offline_resource_handler.cc'],
['exclude', 'browser/renderer_host/offline_resource_handler.h'],
],
@@ -4257,7 +4261,7 @@
{
# Protobuf compiler / generate rule for google apps policy
# TODO(danno): This rule shares a lot with the user feedback proto rule
- # and probably should be generalized to handle both
+ # and probably should be generalized to handle both
'target_name': 'device_management_backend_proto',
'type': 'none',
'sources': [