chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc - Issue 319013002: Reland Fix Views web-modal dialog widget creation.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc

Issue 319013002: Reland Fix Views web-modal dialog widget creation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Revert MediaGalleriesScanResultDialogViews::AcceptDialogForTesting. Created 6 years, 6 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

« no previous file with comments | « chrome/browser/ui/views/ssl_client_certificate_selector.cc ('k') | chrome/browser/ui/views/tab_modal_confirm_dialog_views.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc

diff --git a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc

index b1c19eea3c3a27603bb05dfc18cbd338aaee7898..0619babb49ba97d2dd5b21b88b4a2e545b194414 100644

--- a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc

+++ b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc

@@ -13,8 +13,6 @@

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/host_desktop.h"

#include "chrome/browser/ui/views/constrained_window_views.h"

-#include "components/web_modal/web_contents_modal_dialog_manager.h"

-#include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"

#include "content/public/browser/web_contents.h"

#include "google_apis/gaia/gaia_auth_util.h"

#include "grit/chromium_strings.h"

@@ -53,11 +51,11 @@ ProfileSigninConfirmationDialogViews::ProfileSigninConfirmationDialogViews(

Browser* browser,

const std::string& username,

ui::ProfileSigninConfirmationDelegate* delegate)

- : browser_(browser),

- username_(username),

- delegate_(delegate),

- prompt_for_new_profile_(true),

- continue_signin_button_(NULL) {

+ : browser_(browser),

+ username_(username),

+ delegate_(delegate),

+ prompt_for_new_profile_(true),

+ continue_signin_button_(NULL) {

}

ProfileSigninConfirmationDialogViews::~ProfileSigninConfirmationDialogViews() {}

@@ -143,7 +141,7 @@ void ProfileSigninConfirmationDialogViews::OnClosed() {

}

ui::ModalType ProfileSigninConfirmationDialogViews::GetModalType() const {

- return ui::MODAL_TYPE_WINDOW;

+ return ui::MODAL_TYPE_CHILD;

}

void ProfileSigninConfirmationDialogViews::ViewHierarchyChanged(