Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(182)

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 11000027: Rename GetSite in SiteInstance to GetSiteURL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after
1302 WebContentsImpl* new_contents = 1302 WebContentsImpl* new_contents =
1303 new WebContentsImpl(GetBrowserContext(), 1303 new WebContentsImpl(GetBrowserContext(),
1304 params.opener_suppressed ? NULL : this); 1304 params.opener_suppressed ? NULL : this);
1305 1305
1306 // We must assign the SessionStorageNamespace before calling Init(). 1306 // We must assign the SessionStorageNamespace before calling Init().
1307 // 1307 //
1308 // http://crbug.com/142685 1308 // http://crbug.com/142685
1309 const std::string& partition_id = 1309 const std::string& partition_id =
1310 content::GetContentClient()->browser()-> 1310 content::GetContentClient()->browser()->
1311 GetStoragePartitionIdForSite(GetBrowserContext(), 1311 GetStoragePartitionIdForSite(GetBrowserContext(),
1312 site_instance->GetSite()); 1312 site_instance->GetSiteURL());
1313 content::StoragePartition* partition = 1313 content::StoragePartition* partition =
1314 BrowserContext::GetStoragePartition(GetBrowserContext(), 1314 BrowserContext::GetStoragePartition(GetBrowserContext(),
1315 site_instance); 1315 site_instance);
1316 DOMStorageContextImpl* dom_storage_context = 1316 DOMStorageContextImpl* dom_storage_context =
1317 static_cast<DOMStorageContextImpl*>(partition->GetDOMStorageContext()); 1317 static_cast<DOMStorageContextImpl*>(partition->GetDOMStorageContext());
1318 SessionStorageNamespaceImpl* session_storage_namespace_impl = 1318 SessionStorageNamespaceImpl* session_storage_namespace_impl =
1319 static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace); 1319 static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace);
1320 CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context)); 1320 CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
1321 new_contents->GetController().SetSessionStorageNamespace( 1321 new_contents->GetController().SetSessionStorageNamespace(
1322 partition_id, 1322 partition_id,
(...skipping 2070 matching lines...) Expand 10 before | Expand all | Expand 10 after
3393 } 3393 }
3394 } 3394 }
3395 3395
3396 content::BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { 3396 content::BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() {
3397 return browser_plugin_guest_.get(); 3397 return browser_plugin_guest_.get();
3398 } 3398 }
3399 3399
3400 content::BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { 3400 content::BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() {
3401 return browser_plugin_embedder_.get(); 3401 return browser_plugin_embedder_.get();
3402 } 3402 }
OLDNEW
« no previous file with comments | « content/browser/web_contents/render_view_host_manager_unittest.cc ('k') | content/public/browser/site_instance.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698