diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-09 09:24:59 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-09 09:24:59 +0000 |
| commit | 54944cde97a47ee2148d026cec1da117a426b844 (patch) | |
| tree | 5b9f668af96b85800a56998f052798c811037b90 /chrome/browser/ui/browser_tabrestore.cc | |
| parent | 0da7676478445eff983f8d4afacbbb67f6d1dcd9 (diff) | |
| download | chromium_src-54944cde97a47ee2148d026cec1da117a426b844.zip chromium_src-54944cde97a47ee2148d026cec1da117a426b844.tar.gz chromium_src-54944cde97a47ee2148d026cec1da117a426b844.tar.bz2 | |
Introduces "CreateParams" for web contents, and add |parent| parameter in it.
BUG=155443
TEST=In Goobuntu, add logging of screen_info in RenderViewHost::CreateRenderView() temporarily and make sure the correct scale factor is chosen at boot.
Review URL: https://chromiumcodereview.appspot.com/11361245
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172008 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_tabrestore.cc')
| -rw-r--r-- | chrome/browser/ui/browser_tabrestore.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/ui/browser_tabrestore.cc b/chrome/browser/ui/browser_tabrestore.cc index ff04683..6ddc50a 100644 --- a/chrome/browser/ui/browser_tabrestore.cc +++ b/chrome/browser/ui/browser_tabrestore.cc @@ -17,7 +17,6 @@ #include "content/public/browser/session_storage_namespace.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" -#include "ipc/ipc_message.h" using content::WebContents; using content::NavigationController; @@ -52,11 +51,13 @@ WebContents* CreateRestoredTab( // into the map. content::SessionStorageNamespaceMap session_storage_namespace_map; session_storage_namespace_map[""] = session_storage_namespace; - WebContents* web_contents = content::WebContents::CreateWithSessionStorage( + WebContents::CreateParams create_params( browser->profile(), - tab_util::GetSiteInstanceForNewTab(browser->profile(), restore_url), - MSG_ROUTING_NONE, - browser->tab_strip_model()->GetActiveWebContents(), + tab_util::GetSiteInstanceForNewTab(browser->profile(), restore_url)); + create_params.base_web_contents = + browser->tab_strip_model()->GetActiveWebContents(); + WebContents* web_contents = content::WebContents::CreateWithSessionStorage( + create_params, session_storage_namespace_map); extensions::TabHelper::CreateForWebContents(web_contents); extensions::TabHelper::FromWebContents(web_contents)-> |