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-24 23:33:11 +0000
committergspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-24 23:33:11 +0000
commit5ac2016d3695d469206aad51f04c211a84f1d32f (patch)
treeacadf43dca3c6d459ddc552926b884b92f9b8e7e /chrome/chrome_browser.gypi
parent558987967dfbaf67b7313ab0ee6482db27660717 (diff)
downloadchromium_src-5ac2016d3695d469206aad51f04c211a84f1d32f.zip
chromium_src-5ac2016d3695d469206aad51f04c211a84f1d32f.tar.gz
chromium_src-5ac2016d3695d469206aad51f04c211a84f1d32f.tar.bz2
This is another try to commit OOM priority management.
This changes nothing, except that I now initialize memory_used in oom_priority_manager.cc to placate the incorrect gcc warning about it being used when uninitialized. The original review is here: http://codereview.chromium.org/4498001/ BUG=none TEST=Passed chromeos try-bot, built both debug and release locally. Review URL: http://codereview.chromium.org/5328003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
-rw-r--r--chrome/chrome_browser.gypi4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index a812d15..b66417a 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2340,6 +2340,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',
@@ -3438,6 +3440,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'],
],