chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_cocoa_unittest.mm - Issue 505123002: Revert "Revert of Hook up the Mac password bubble to the browser and add browser tests. (patchset #…

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/passwords/manage_passwords_bubble_cocoa_unittest.mm

Issue 505123002: Revert "Revert of Hook up the Mac password bubble to the browser and add browser tests. (patchset #… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix include for real this time Created 6 years, 4 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/passwords/manage_passwords_bubble_cocoa.mm ('k') | chrome/browser/ui/passwords/manage_passwords_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_cocoa_unittest.mm

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

index cb35ecab9d67b144875b262c9ca47ea86ee804a4..82eb43084dc22a475e5aaa58844a3132d8760a5e 100644

--- a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_cocoa_unittest.mm

+++ b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_cocoa_unittest.mm

@@ -9,9 +9,13 @@

#include "base/compiler_specific.h"

#include "base/mac/foundation_util.h"

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

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

+#import "chrome/browser/ui/cocoa/browser_window_controller.h"

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

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

#import "chrome/browser/ui/cocoa/info_bubble_window.h"

+#include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"

+#include "chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.h"

#import "chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller.h"

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

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

@@ -46,12 +50,18 @@ class ManagePasswordsBubbleCocoaTest : public CocoaProfileTest {

content::WebContents* webContents() { return webContents_; }

void ShowBubble() {

+ NSWindow* nativeWindow = browser()->window()->GetNativeWindow();

+ BrowserWindowController* bwc =

+ [BrowserWindowController browserWindowControllerForWindow:nativeWindow];

+ ManagePasswordsIcon* icon =

+ [bwc locationBarBridge]->manage_passwords_decoration()->icon();

ManagePasswordsBubbleCocoa::ShowBubble(

- webContents(), ManagePasswordsBubble::DisplayReason::AUTOMATIC);

+ webContents(), ManagePasswordsBubble::DisplayReason::AUTOMATIC, icon);

// Disable animations so that closing happens immediately.

- InfoBubbleWindow* window = base::mac::ObjCCast<InfoBubbleWindow>(

+ InfoBubbleWindow* bubbleWindow = base::mac::ObjCCast<InfoBubbleWindow>(

[ManagePasswordsBubbleCocoa::instance()->controller_ window]);

- [window setAllowedAnimations:info_bubble::kAnimateNone];

+ [bubbleWindow setAllowedAnimations:info_bubble::kAnimateNone];

}

void CloseBubble() {