Make sure links in the profile unlock reauth don't break out of popup.

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

 // Copyright 2013 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/inline_login_handler_impl.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 51 matching lines @@
 #include "net/base/url_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 void LogHistogramValue(int action) {
   UMA_HISTOGRAM_ENUMERATION("Signin.AllAccessPointActions", action,
                             signin_metrics::HISTOGRAM_MAX);
 }
 
+bool IsUserManagerReauthenticatingProfile(Profile* profile) {

[achuithb, 2015/09/28 20:11:48]

Could you please add a function comment?

Does it make more sense to just call this method IsSystemProfile?

[Roger Tawa OOO till Jul 10th, 2015/09/28 20:57:11]

Done.

+  return profile->GetOriginalProfile()->IsSystemProfile();
+}
+
 void RedirectToNtpOrAppsPage(content::WebContents* contents,
                              signin_metrics::Source source) {
   // Do nothing if a navigation is pending, since this call can be triggered
   // from DidStartLoading. This avoids deleting the pending entry while we are
   // still navigating to it. See crbug/346632.
   if (contents->GetController().GetPendingEntry())
     return;
 
   VLOG(1) << "RedirectToNtpOrAppsPage";
   // Redirect to NTP/Apps page and display a confirmation bubble
@@ skipping 510 matching lines @@
       }
     }
   }
 
   return true;
 }
 
 void InlineLoginHandlerImpl::SetExtraInitParams(base::DictionaryValue& params) {
   params.SetString("service", "chromiumsync");
 
+  // If this was called from the user manager to reauthenticate the profile,
+  // make sure the webui is aware.
+  Profile* profile = Profile::FromWebUI(web_ui());
+  if (IsUserManagerReauthenticatingProfile(profile))
+    params.SetBoolean("dontResizeNonEmbeddedPages", true);
+
   content::WebContents* contents = web_ui()->GetWebContents();
   content::WebContentsObserver::Observe(contents);
   LogHistogramValue(signin_metrics::HISTOGRAM_SHOWN);
 }
 
 void InlineLoginHandlerImpl::CompleteLogin(const base::ListValue* args) {
   content::WebContents* contents = web_ui()->GetWebContents();
   const GURL& current_url = contents->GetURL();
 
   const base::DictionaryValue* dict = NULL;
@@ skipping 36 matching lines @@
 
   content::StoragePartition* partition =
       content::BrowserContext::GetStoragePartitionForSite(
           contents->GetBrowserContext(), signin::GetSigninPartitionURL());
 
   // If this was called from the user manager to reauthenticate the profile,
   // the current profile is the system profile.  In this case, use the email to
   // find the right profile to reauthenticate.  Otherwise the profile can be
   // taken from web_ui().
   Profile* profile = Profile::FromWebUI(web_ui());
-  if (profile->GetOriginalProfile()->IsSystemProfile()) {
+  if (IsUserManagerReauthenticatingProfile(profile)) {
     // Switch to the profile and finish the login.  Don't pass a handler pointer
     // since it will be destroyed before the callback runs.
     ProfileManager* manager = g_browser_process->profile_manager();
     base::FilePath path = profiles::GetPathOfProfileWithEmail(manager, email);
     if (!path.empty()) {
       FinishCompleteLoginParams params(nullptr, partition, current_url, path,
                                        confirm_untrusted_signin_, email,
                                        gaia_id, password, session_index,
                                        choose_what_to_sync);
       ProfileManager::CreateCallback callback = base::Bind(
@@ skipping 199 matching lines @@
       }
     }
 
     if (show_account_management) {
       browser->window()->ShowAvatarBubbleFromAvatarButton(
             BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT,
             signin::ManageAccountsParams());
     }
   }
 }