summaryrefslogtreecommitdiffstats
path: root/content/shell
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-20 12:28:58 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-20 12:28:58 +0000
commite1dd56245e0d9e0c5ff69b7a14a61f3f010ac50e (patch)
tree8ebb4521cc02357580b05336f991f35a245f3cb6 /content/shell
parentddb92f133c7776004575d4c9c52cf709f5082dcc (diff)
downloadchromium_src-e1dd56245e0d9e0c5ff69b7a14a61f3f010ac50e.zip
chromium_src-e1dd56245e0d9e0c5ff69b7a14a61f3f010ac50e.tar.gz
chromium_src-e1dd56245e0d9e0c5ff69b7a14a61f3f010ac50e.tar.bz2
Deprecate WEBKIT thread
BUG=106839 TEST=try servers pass Review URL: http://codereview.chromium.org/8879013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
-rw-r--r--content/shell/shell_browser_context.cc3
-rw-r--r--content/shell/shell_browser_main.cc2
2 files changed, 3 insertions, 2 deletions
diff --git a/content/shell/shell_browser_context.cc b/content/shell/shell_browser_context.cc
index f5c6996..a5ae692 100644
--- a/content/shell/shell_browser_context.cc
+++ b/content/shell/shell_browser_context.cc
@@ -248,7 +248,8 @@ void ShellBrowserContext::CreateQuotaManagerAndClients() {
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
webkit_context_ = new WebKitContext(
IsOffTheRecord(), GetPath(), NULL, false, quota_manager_->proxy(),
- BrowserThread::GetMessageLoopProxyForThread(BrowserThread::WEBKIT));
+ BrowserThread::GetMessageLoopProxyForThread(
+ BrowserThread::WEBKIT_DEPRECATED));
appcache_service_ = new ChromeAppCacheService(quota_manager_->proxy());
scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy;
BrowserThread::PostTask(
diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc
index 6b14d0f..035b302 100644
--- a/content/shell/shell_browser_main.cc
+++ b/content/shell/shell_browser_main.cc
@@ -66,7 +66,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() {
}
void ShellBrowserMainParts::PreStopThread(BrowserThread::ID id) {
- if (id == BrowserThread::WEBKIT) {
+ if (id == BrowserThread::WEBKIT_DEPRECATED) {
resource_dispatcher_host_.reset();
}
}