diff options
| author | Steve Block <steveblock@google.com> | 2010-10-27 13:33:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-27 13:33:41 -0700 |
| commit | b8d23f0d1ebcc105e26e6af3ff9a02dcc935ceb2 (patch) | |
| tree | 6b8e3d5a0791408079df17406d9fbd7ec637ec82 /WebKit/android/WebCoreSupport | |
| parent | 91c4d4fb8652d4a7d01e3f7d6f578eb18c5b97ff (diff) | |
| parent | cdd71a7fc10d596d099e18d0993df2d3209c1228 (diff) | |
| download | external_webkit-b8d23f0d1ebcc105e26e6af3ff9a02dcc935ceb2.zip external_webkit-b8d23f0d1ebcc105e26e6af3ff9a02dcc935ceb2.tar.gz external_webkit-b8d23f0d1ebcc105e26e6af3ff9a02dcc935ceb2.tar.bz2 | |
Merge "Fix a missing namespace in WebCache"
Diffstat (limited to 'WebKit/android/WebCoreSupport')
| -rw-r--r-- | WebKit/android/WebCoreSupport/WebCache.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/WebKit/android/WebCoreSupport/WebCache.cpp b/WebKit/android/WebCoreSupport/WebCache.cpp index 69ede65..b0ae915 100644 --- a/WebKit/android/WebCoreSupport/WebCache.cpp +++ b/WebKit/android/WebCoreSupport/WebCache.cpp @@ -27,6 +27,8 @@ #include "WebRequestContext.h" #include "WebUrlLoaderClient.h" +using namespace net; + namespace android { WebCache* WebCache::s_instance = 0; @@ -60,11 +62,11 @@ void WebCache::doClear() return; m_isClearInProgress = true; URLRequestContext* context = WebRequestContext::get(false /* isPrivateBrowsing */); - net::HttpTransactionFactory* factory = context->http_transaction_factory(); + HttpTransactionFactory* factory = context->http_transaction_factory(); int code = factory->GetCache()->GetBackend(&m_cacheBackend, &m_doomAllEntriesCallback); // Code ERR_IO_PENDING indicates that the operation is still in progress and // the supplied callback will be invoked when it completes. - if (code == net::ERR_IO_PENDING) + if (code == ERR_IO_PENDING) return; else if (code != OK) { m_isClearInProgress = false; @@ -83,7 +85,7 @@ void WebCache::doomAllEntries(int) int code = m_cacheBackend->DoomAllEntries(&m_doneCallback); // Code ERR_IO_PENDING indicates that the operation is still in progress and // the supplied callback will be invoked when it completes. - if (code == net::ERR_IO_PENDING) + if (code == ERR_IO_PENDING) return; else if (code != OK) { m_isClearInProgress = false; |