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/sessions | |
| 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/sessions')
| -rw-r--r-- | chrome/browser/sessions/session_restore_android.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/sessions/session_restore_browsertest.cc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser/sessions/session_restore_android.cc index 7864667..4ad11bc 100644 --- a/chrome/browser/sessions/session_restore_android.cc +++ b/chrome/browser/sessions/session_restore_android.cc @@ -12,7 +12,6 @@ #include "chrome/browser/ui/android/tab_model/tab_model_list.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents.h" -#include "ipc/ipc_message.h" // The android implementation does not do anything "foreign session" specific. // We use it to restore tabs from "recently closed" too. @@ -30,7 +29,7 @@ void SessionRestore::RestoreForeignSessionTab( TabNavigation::CreateNavigationEntriesFromTabNavigations( session_tab.navigations, profile); content::WebContents* new_web_contents = content::WebContents::Create( - context, NULL, MSG_ROUTING_NONE, NULL); + content::WebContents::CreateParams(context)); int selected_index = session_tab.normalized_navigation_index(); new_web_contents->GetController().Restore( selected_index, diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc index 6510921..9c5b50a 100644 --- a/chrome/browser/sessions/session_restore_browsertest.cc +++ b/chrome/browser/sessions/session_restore_browsertest.cc @@ -889,7 +889,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, SessionStorageAfterTabReplace) { controller->GetDefaultSessionStorageNamespace(); scoped_ptr<content::WebContents> web_contents( content::WebContents::CreateWithSessionStorage( - browser()->profile(), NULL, MSG_ROUTING_NONE, NULL, + content::WebContents::CreateParams(browser()->profile()), session_storage_namespace_map)); TabStripModel* tab_strip_model = browser()->tab_strip_model(); |