diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-13 13:24:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-14 10:57:25 +0000 |
| commit | af3d4809763ef308f08ced947a73b624729ac7ea (patch) | |
| tree | 4402b911e30383f6c6dace1e8cf3b8e85355db3a /chromium/net/http/mock_http_cache.h | |
| parent | 0e8ff63a407fe323e215bb1a2c423c09a4747c8a (diff) | |
| download | qtwebengine-chromium-af3d4809763ef308f08ced947a73b624729ac7ea.tar.gz | |
BASELINE: Update Chromium to 47.0.2526.14
Also adding in sources needed for spellchecking.
Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/net/http/mock_http_cache.h')
| -rw-r--r-- | chromium/net/http/mock_http_cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/net/http/mock_http_cache.h b/chromium/net/http/mock_http_cache.h index c5e5fd9bcf2..632bb3e63c1 100644 --- a/chromium/net/http/mock_http_cache.h +++ b/chromium/net/http/mock_http_cache.h @@ -102,7 +102,7 @@ class MockDiskEntry : public disk_cache::Entry, bool fail_sparse_requests_; bool busy_; bool delayed_; - static bool cancel_; + bool cancel_; static bool ignore_callbacks_; }; |