chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc - Issue 2784823002: Reland "Use the same browser instance in the sync confirmation dialog.

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/profiles/signin_view_controller_delegate_views.cc

Issue 2784823002: Reland "Use the same browser instance in the sync confirmation dialog. (Closed)

Patch Set: Rebase and fix conflicts Created 3 years, 9 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/cocoa/profiles/signin_view_controller_delegate_mac.mm ('k') | chrome/browser/ui/webui/signin/signin_error_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc

diff --git a/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc b/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc

index 452fd9e93381939ebdd3c4ad5d860d1b12a22a00..5971cd5f77276dcf8f20a5e67ac31fcc471e2aa1 100644

--- a/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc

+++ b/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc

@@ -11,6 +11,7 @@

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

#include "chrome/browser/ui/tabs/tab_strip_model.h"

#include "chrome/browser/ui/views/frame/browser_view.h"

+#include "chrome/browser/ui/webui/signin/sync_confirmation_ui.h"

#include "chrome/common/url_constants.h"

#include "components/constrained_window/constrained_window_views.h"

#include "components/signin/core/common/profile_management_switches.h"

@@ -184,7 +185,9 @@ SigninViewControllerDelegateViews::CreateSyncConfirmationWebView(

Browser* browser) {

views::WebView* web_view = new views::WebView(browser->profile());

web_view->LoadInitialURL(GURL(chrome::kChromeUISyncConfirmationURL));

+ SyncConfirmationUI* sync_confirmation_ui = static_cast<SyncConfirmationUI*>(

+ web_view->GetWebContents()->GetWebUI()->GetController());

+ sync_confirmation_ui->InitializeMessageHandlerWithBrowser(browser);

int dialog_preferred_height =

GetSyncConfirmationDialogPreferredHeight(browser->profile());

int max_height = browser