Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(928)

Unified Diff: chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h

Issue 2619963003: Change the views sign-in dialog to be tab modal. (Closed)
Patch Set: Fix field order Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h
diff --git a/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h b/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h
index 64c9e7533d4663389a33814dfa932d1d3f9ab775..5cb52ce3f03d9d0f87da5e764f7aa3ddd3a4f5e0 100644
--- a/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h
+++ b/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h
@@ -31,15 +31,6 @@ class WebView;
class SigninViewControllerDelegateViews : public views::DialogDelegateView,
public SigninViewControllerDelegate {
public:
- // Creates and displays a constrained window containing |web_contents|. If
- // |wait_for_size| is true, the delegate will wait for ResizeNativeView() to
- // be called by the base class before displaying the constrained window.
- SigninViewControllerDelegateViews(
- SigninViewController* signin_view_controller,
- std::unique_ptr<views::WebView> content_view,
- Browser* browser,
- bool wait_for_size);
-
// Creates the web view that contains the signin flow in |mode| using
// |profile| as the web content's profile, then sets |delegate| as the created
// web content's delegate.
@@ -65,15 +56,27 @@ class SigninViewControllerDelegateViews : public views::DialogDelegateView,
int GetDialogButtons() const override;
private:
+ friend SigninViewControllerDelegate;
+
+ // Creates and displays a constrained window containing |web_contents|. If
+ // |wait_for_size| is true, the delegate will wait for ResizeNativeView() to
+ // be called by the base class before displaying the constrained window.
+ SigninViewControllerDelegateViews(
+ SigninViewController* signin_view_controller,
+ std::unique_ptr<views::WebView> content_view,
+ Browser* browser,
+ ui::ModalType dialog_modal_type,
+ bool wait_for_size);
+ ~SigninViewControllerDelegateViews() override;
+
void PerformClose() override;
void ResizeNativeView(int height) override;
void DisplayModal();
- ~SigninViewControllerDelegateViews() override;
-
views::WebView* content_view_;
views::Widget* modal_signin_widget_; // Not owned.
+ ui::ModalType dialog_modal_type_;
// wait_for_size_ stores whether the dialog should only be shown after its
// content's size has been laid out and measured so that the constrained

Powered by Google App Engine
This is Rietveld 408576698