Fix sizing issues in the tab modal signin flow.

chrome/browser/ui/webui/signin/sync_confirmation_handler.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/signin/sync_confirmation_handler.h"
 
 #include "base/bind.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/signin_view_controller_delegate.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "url/gurl.h"
 
 const int kProfileImageSize = 128;
 
 SyncConfirmationHandler::SyncConfirmationHandler() {}
 
 SyncConfirmationHandler::~SyncConfirmationHandler() {
   Profile* profile = Profile::FromWebUI(web_ui());
   AccountTrackerServiceFactory::GetForProfile(profile)->RemoveObserver(this);
 }
 
 void SyncConfirmationHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("confirm",
       base::Bind(&SyncConfirmationHandler::HandleConfirm,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("undo",
       base::Bind(&SyncConfirmationHandler::HandleUndo, base::Unretained(this)));
-  web_ui()->RegisterMessageCallback("initialized",
-      base::Bind(&SyncConfirmationHandler::HandleInitialized,
-                 base::Unretained(this)));
   web_ui()->RegisterMessageCallback("goToSettings",
       base::Bind(&SyncConfirmationHandler::HandleGoToSettings,
                  base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("initializedWithSize",
+      base::Bind(&SyncConfirmationHandler::HandleInitializedWithSize,
+                 base::Unretained(this)));
 }
 
 void SyncConfirmationHandler::HandleConfirm(const base::ListValue* args) {
   CloseModalSigninWindow(LoginUIService::SYNC_WITH_DEFAULT_SETTINGS);
 }
 
 void SyncConfirmationHandler::HandleGoToSettings(const base::ListValue* args) {
   CloseModalSigninWindow(LoginUIService::CONFIGURE_SYNC_FIRST);
 }
 
 void SyncConfirmationHandler::HandleUndo(const base::ListValue* args) {
   content::RecordAction(base::UserMetricsAction("Signin_Undo_Signin"));
   Browser* browser = GetDesktopBrowser();
   LoginUIServiceFactory::GetForProfile(browser->profile())->
       SyncConfirmationUIClosed(LoginUIService::ABORT_SIGNIN);
   SigninManagerFactory::GetForProfile(Profile::FromWebUI(web_ui()))->SignOut(
       signin_metrics::ABORT_SIGNIN,
       signin_metrics::SignoutDelete::IGNORE_METRIC);
   browser->CloseModalSigninWindow();
 }
 
-void SyncConfirmationHandler::HandleInitialized(const base::ListValue* args) {
-  Browser* browser = GetDesktopBrowser();
-  Profile* profile = browser->profile();
-  std::vector<AccountInfo> accounts =
-      AccountTrackerServiceFactory::GetForProfile(profile)->GetAccounts();
-
-  if (accounts.empty())
-    return;
-
-  AccountInfo primary_account_info = accounts[0];
-
-  if (!primary_account_info.IsValid())
-    AccountTrackerServiceFactory::GetForProfile(profile)->AddObserver(this);
-  else
-    SetUserImageURL(primary_account_info.picture_url);
-}
-
 void SyncConfirmationHandler::SetUserImageURL(const std::string& picture_url) {
   GURL url;
   if (profiles::GetImageURLWithThumbnailSize(GURL(picture_url),
                                              kProfileImageSize,
                                              &url)) {
     base::StringValue picture_url_value(url.spec());
     web_ui()->CallJavascriptFunction(
         "sync.confirmation.setUserImageURL", picture_url_value);
   }
 }
@@ skipping 15 matching lines @@
   return browser;
 }
 
 void SyncConfirmationHandler::CloseModalSigninWindow(
     LoginUIService::SyncConfirmationUIClosedResults results) {
   Browser* browser = GetDesktopBrowser();
   LoginUIServiceFactory::GetForProfile(browser->profile())->
       SyncConfirmationUIClosed(results);
   browser->CloseModalSigninWindow();
 }
+
+void SyncConfirmationHandler::HandleInitializedWithSize(
+    const base::ListValue* args) {
+  Browser* browser = GetDesktopBrowser();
+  Profile* profile = browser->profile();
+  std::vector<AccountInfo> accounts =
+      AccountTrackerServiceFactory::GetForProfile(profile)->GetAccounts();
+
+  if (accounts.empty())
+    return;
+
+  AccountInfo primary_account_info = accounts[0];
+
+  if (!primary_account_info.IsValid())
+    AccountTrackerServiceFactory::GetForProfile(profile)->AddObserver(this);
+  else
+    SetUserImageURL(primary_account_info.picture_url);
+
+  double height;
+  bool success = args->GetDouble(0, &height);
+  DCHECK(success);
+
+  browser->signin_view_controller()->delegate()->ResizeNativeView(
+      static_cast<int>(height));
+}