chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_cocoa_unittest.mm - Issue 444603003: Hook up the Mac password bubble to the browser and add browser tests.

Unified Diff: chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_cocoa_unittest.mm

Issue 444603003: Hook up the Mac password bubble to the browser and add browser tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sort gypi 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

« chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_browsertest.mm ('K') | « chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_cocoa.mm ('k') | chrome/browser/ui/passwords/manage_passwords_test.h » ('j') | chrome/browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc » ('J')
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 6dc0672f095d480832e2408ae381ad3b008996a1..78c9f6dac035affe66a3f22eb8619484b224c08d 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"

@@ -43,12 +47,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() {