diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 19:13:38 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 19:13:38 +0000 |
| commit | 8f1ad25657141e93759dc7ab71b3630f50cafa88 (patch) | |
| tree | 2aa56b9c798b33d27b18333b0a439a7f01d5c289 /chrome/chrome_browser_chromeos.gypi | |
| parent | 29125cfe3e83e71d7c9bbb920415dee4f470d833 (diff) | |
| download | chromium_src-8f1ad25657141e93759dc7ab71b3630f50cafa88.zip chromium_src-8f1ad25657141e93759dc7ab71b3630f50cafa88.tar.gz chromium_src-8f1ad25657141e93759dc7ab71b3630f50cafa88.tar.bz2 | |
Added merge session request throttle for XHR requests.
BUG=308318,309131,308681
TEST=manual, added MergeSessionTest.MergeSessionThrottle
Review URL: https://codereview.chromium.org/118733002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242135 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser_chromeos.gypi')
| -rw-r--r-- | chrome/chrome_browser_chromeos.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi index 85d89c3..d5794f2 100644 --- a/chrome/chrome_browser_chromeos.gypi +++ b/chrome/chrome_browser_chromeos.gypi @@ -525,6 +525,8 @@ 'browser/chromeos/login/merge_session_load_page.h', 'browser/chromeos/login/merge_session_throttle.cc', 'browser/chromeos/login/merge_session_throttle.h', + 'browser/chromeos/login/merge_session_xhr_request_waiter.cc', + 'browser/chromeos/login/merge_session_xhr_request_waiter.h', 'browser/chromeos/login/mount_manager.cc', 'browser/chromeos/login/mount_manager.h', 'browser/chromeos/login/multi_profile_first_run_notification.cc', |