| Index: chrome/browser/chromeos/first_run/drive_first_run_controller.cc
|
| diff --git a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc
|
| index ae66cfaf11ef039feea1b7b092bb896c0ac8b974..445f25956b28e334b7c1522bb1e9253b5ab8f157 100644
|
| --- a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc
|
| +++ b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc
|
| @@ -163,8 +163,10 @@ class DriveWebContentsManager : public content::WebContentsObserver,
|
| // content::WebContentsDelegate overrides:
|
| bool ShouldCreateWebContents(
|
| content::WebContents* web_contents,
|
| - int route_id,
|
| - int main_frame_route_id,
|
| + int32 route_id,
|
| + int32 main_frame_route_id,
|
| + int32 main_frame_widget_route_id,
|
| + int32 surface_id,
|
| WindowContainerType window_container_type,
|
| const std::string& frame_name,
|
| const GURL& target_url,
|
| @@ -279,8 +281,10 @@ void DriveWebContentsManager::DidFailLoad(
|
|
|
| bool DriveWebContentsManager::ShouldCreateWebContents(
|
| content::WebContents* web_contents,
|
| - int route_id,
|
| - int main_frame_route_id,
|
| + int32 route_id,
|
| + int32 main_frame_route_id,
|
| + int32 main_frame_widget_route_id,
|
| + int32 surface_id,
|
| WindowContainerType window_container_type,
|
| const std::string& frame_name,
|
| const GURL& target_url,
|
| @@ -306,15 +310,12 @@ bool DriveWebContentsManager::ShouldCreateWebContents(
|
| base::UTF8ToUTF16(app_id_))) {
|
| return false;
|
| }
|
| - BackgroundContents* contents = background_contents_service
|
| - ->CreateBackgroundContents(content::SiteInstance::Create(profile_),
|
| - route_id,
|
| - main_frame_route_id,
|
| - profile_,
|
| - frame_name,
|
| - base::ASCIIToUTF16(app_id_),
|
| - partition_id,
|
| - session_storage_namespace);
|
| + BackgroundContents* contents =
|
| + background_contents_service->CreateBackgroundContents(
|
| + content::SiteInstance::Create(profile_), route_id,
|
| + main_frame_route_id, main_frame_widget_route_id, surface_id, profile_,
|
| + frame_name, base::ASCIIToUTF16(app_id_), partition_id,
|
| + session_storage_namespace);
|
|
|
| contents->web_contents()->GetController().LoadURL(
|
| target_url,
|
|
|