chrome/browser/ui/cocoa/browser_window_cocoa.mm - Issue 13845022: Mac: Display a native bubble (instead of the JS one) after the web signin flow. (branched from http…

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/cocoa/browser_window_cocoa.mm

Issue 13845022: Mac: Display a native bubble (instead of the JS one) after the web signin flow. (branched from http… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ntpBubble

Patch Set: Fix bot issues Created 7 years, 8 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/app/nibs/OneClickSigninBubble.xib ('k') | chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h » ('j') | chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/browser_window_cocoa.mm

diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm

index 7187d47dc475a09157e310e6aeb27c50bc96efe0..6e6a6b9247c3e43594d413035aad860ed25e2e2d 100644

--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm

+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm

@@ -482,15 +482,17 @@ void BrowserWindowCocoa::ShowOneClickSigninBubble(

const string16& email,

const string16& error_message,

const StartSyncCallback& start_sync_callback) {

+ WebContents* web_contents =

+ browser_->tab_strip_model()->GetActiveWebContents();

if (type == ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE) {

scoped_nsobject<OneClickSigninBubbleController> bubble_controller(

[[OneClickSigninBubbleController alloc]

initWithBrowserWindowController:cocoa_controller()

+ webContents:web_contents

+ errorMessage:error_message

callback:start_sync_callback]);

[bubble_controller showWindow:nil];

} else {

- WebContents* web_contents =

- browser_->tab_strip_model()->GetActiveWebContents();

// Deletes itself when the dialog closes.

new OneClickSigninDialogController(web_contents, start_sync_callback);

}