| Index: chrome/browser/chromeos/login/merge_session_load_page.cc
|
| diff --git a/chrome/browser/chromeos/login/merge_session_load_page.cc b/chrome/browser/chromeos/login/merge_session_load_page.cc
|
| index 0734cda8b189c081817cc712c7f99d17844f26af..8f5f321966a5f620880f097f0291c40c5424ac4c 100644
|
| --- a/chrome/browser/chromeos/login/merge_session_load_page.cc
|
| +++ b/chrome/browser/chromeos/login/merge_session_load_page.cc
|
| @@ -51,9 +51,10 @@ const int kTotalWaitTimeMS = 10000;
|
|
|
| namespace chromeos {
|
|
|
| -MergeSessionLoadPage::MergeSessionLoadPage(WebContents* web_contents,
|
| - const GURL& url,
|
| - const CompletionCallback& callback)
|
| +MergeSessionLoadPage::MergeSessionLoadPage(
|
| + WebContents* web_contents,
|
| + const GURL& url,
|
| + const MergeSessionThrottle::CompletionCallback& callback)
|
| : callback_(callback),
|
| proceeded_(false),
|
| web_contents_(web_contents),
|
|
|