Add a modal confirmation dialog to the enterprise profile sign-in flow.

chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.h

+// Copyright (c) 2012 The Chromium Authors. All rights reserved.

[Andrew T Wilson (Slow), 2013/02/10 20:47:26]

2012->2013

[dconnelly, 2013/02/11 09:35:16]

Done.

+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_PROFILE_SIGNIN_CONFIRMATION_DIALOG_H_
+#define CHROME_BROWSER_UI_WEBUI_SIGNIN_PROFILE_SIGNIN_CONFIRMATION_DIALOG_H_
+
+#include <string>
+
+#include "base/callback.h"
+#include "base/string16.h"
+#include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
+#include "chrome/browser/ui/webui/signin/profile_signin_confirmation_handler.h"

[Andrew T Wilson (Slow), 2013/02/10 20:47:26]

Can you use a forward decl (i.e. "class ProfileSigninConfirmationHandler"
instead of including the header file? Likewise for WebUIMessageHandler?

[dconnelly, 2013/02/11 09:35:16]

Done.

+#include "content/public/browser/web_ui_message_handler.h"
+#include "ui/base/ui_base_types.h"
+#include "ui/web_dialogs/web_dialog_delegate.h"
+
+// Deletes itself when the dialog is closed.
+class ProfileSigninConfirmationDialog : public ui::WebDialogDelegate {
+ public:
+  static void ShowDialog(const std::string& username,
+                         const base::Closure& cancel_signin,
+                         const base::Closure& signin_with_new_profile,
+                         const base::Closure& continue_signin);
+  void Close();
+
+ private:
+  explicit ProfileSigninConfirmationDialog(

[Andrew T Wilson (Slow), 2013/02/10 20:47:26]

nit: remove explicit (only use if the constructor takes only one arg)

[dconnelly, 2013/02/11 09:35:16]

Done.

+      const std::string& username,
+      const base::Closure& cancel_signin,
+      const base::Closure& signin_with_new_profile,
+      const base::Closure& continue_signin);
+  virtual ~ProfileSigninConfirmationDialog();
+
+  // Overridden from WebDialogDelegate:
+  virtual ui::ModalType GetDialogModalType() const OVERRIDE;
+  virtual string16 GetDialogTitle() const OVERRIDE;
+  virtual GURL GetDialogContentURL() const OVERRIDE;
+  virtual void GetWebUIMessageHandlers(
+      std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE;
+  virtual void GetDialogSize(gfx::Size* size) const OVERRIDE;
+  virtual std::string GetDialogArgs() const OVERRIDE;
+  virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE;
+  virtual void OnCloseContents(content::WebContents* source,
+                               bool* out_close_dialog) OVERRIDE;
+  virtual bool ShouldShowDialogTitle() const OVERRIDE;
+
+  // Deletes itself.
+  ConstrainedWebDialogDelegate* delegate_;
+
+  std::string username_;
+  mutable scoped_ptr<ProfileSigninConfirmationHandler> handler_;

[Andrew T Wilson (Slow), 2013/02/10 20:47:26]

One thing to consider is to do one of the following:

a) Get rid of ProfileSIgninConfirmationHandler and move that functionality into
this class (that would also allow you to easily fire off the "cancel signin"
callback if the user closes the tab and it hasn't been fired off yet).

or b) Move the ProfileSIgninConfirmationHandler definition and implementation
into profile_signin_confirmation_dialog.cc instead of in a separate file, since
it won't be used by any external class.

I'd probably do a) unless there's a technical reason not to.

[dconnelly, 2013/02/11 09:59:21]

There needs to be two distinct objects, because both are owned by different
objects:
- The WebDialogDelegate (ProfileSigninConfirmationDialog) is owned by the
ConstrainedWebDialogDelegate
- The WebUIMessageHandler (ProfileSigninConfirmationHandler) is owned by the
ConstrainedWebDialogUI

So if I merge them it will be deleted twice.  I'll go ahead and move the handler
into profile_signin_confirmation_dialog.cc, though.

+
+  DISALLOW_COPY_AND_ASSIGN(ProfileSigninConfirmationDialog);
+};
+
+#endif  // CHROME_BROWSER_UI_WEBUI_SIGNIN_PROFILE_SIGNIN_CONFIRMATION_DIALOG_H_