| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "content/browser/resource_context_impl.h" | 5 #include "content/browser/resource_context_impl.h" | 
| 6 | 6 | 
| 7 #include "base/logging.h" | 7 #include "base/logging.h" | 
| 8 #include "content/browser/fileapi/chrome_blob_storage_context.h" | 8 #include "content/browser/fileapi/chrome_blob_storage_context.h" | 
| 9 #include "content/browser/host_zoom_map_impl.h" | 9 #include "content/browser/host_zoom_map_impl.h" | 
| 10 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 10 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 124   resource_context->SetUserData( | 124   resource_context->SetUserData( | 
| 125       kStreamContextKeyName, | 125       kStreamContextKeyName, | 
| 126       new UserDataAdapter<StreamContext>( | 126       new UserDataAdapter<StreamContext>( | 
| 127           StreamContext::GetFor(browser_context))); | 127           StreamContext::GetFor(browser_context))); | 
| 128 | 128 | 
| 129   // This object is owned by the BrowserContext and not ResourceContext, so | 129   // This object is owned by the BrowserContext and not ResourceContext, so | 
| 130   // store a non-owning pointer here. | 130   // store a non-owning pointer here. | 
| 131   resource_context->SetUserData( | 131   resource_context->SetUserData( | 
| 132       kHostZoomMapKeyName, | 132       kHostZoomMapKeyName, | 
| 133       new NonOwningZoomData( | 133       new NonOwningZoomData( | 
| 134           HostZoomMap::GetForBrowserContext(browser_context))); | 134           HostZoomMap::GetDefaultForBrowserContext(browser_context))); | 
| 135 | 135 | 
| 136   resource_context->DetachUserDataThread(); | 136   resource_context->DetachUserDataThread(); | 
| 137 } | 137 } | 
| 138 | 138 | 
| 139 }  // namespace content | 139 }  // namespace content | 
| OLD | NEW | 
|---|