Revert "Revert of Hook up the Mac password bubble to the browser and add browser tests. (patchset #…

chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_cocoa.mm

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_cocoa.h"
 
 #include "base/mac/scoped_block.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_finder.h"
+#import "chrome/browser/ui/cocoa/browser_window_controller.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_icon.h"
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 #include "content/public/browser/web_contents.h"
 
 typedef void (^Callback)(void);
 
 @interface ManagePasswordsBubbleCocoaNotificationBridge : NSObject {
   base::mac::ScopedBlock<Callback> callback_;
 }
 - (id)initWithCallback:(Callback)callback;
 - (void)onClose;
 @end
 
 @implementation ManagePasswordsBubbleCocoaNotificationBridge
 - (id)initWithCallback:(Callback)callback {
   if ((self = [super init])) {
     callback_.reset(callback, base::scoped_policy::RETAIN);
   }
   return self;
 }
 - (void)onClose {
   callback_.get()();
 }
 @end
 
 // static
 ManagePasswordsBubbleCocoa* ManagePasswordsBubbleCocoa::bubble_ = NULL;
 
+namespace chrome {
+void ShowManagePasswordsBubble(content::WebContents* webContents) {
+  ManagePasswordsBubbleCocoa* instance = ManagePasswordsBubbleCocoa::instance();
+  if (instance && (instance->webContents_ != webContents)) {
+    // The bubble is currently shown for some other tab. We should close it now
+    // and open for |webContents|.
+    instance->Close();
+  }
+
+  ManagePasswordsUIController* controller =
+      ManagePasswordsUIController::FromWebContents(webContents);
+  NSWindow* window = webContents->GetTopLevelNativeWindow();
+  BrowserWindowController* bwc =
+      [BrowserWindowController browserWindowControllerForWindow:window];
+  ManagePasswordsBubbleCocoa::ShowBubble(
+      webContents,
+      password_manager::ui::IsAutomaticDisplayState(controller->state())
+          ? ManagePasswordsBubble::AUTOMATIC
+          : ManagePasswordsBubble::USER_ACTION,
+      [bwc locationBarBridge]->manage_passwords_decoration()->icon());
+}
+}  // namespace chrome
+
 ManagePasswordsBubbleCocoa::ManagePasswordsBubbleCocoa(
     content::WebContents* webContents,
-    DisplayReason displayReason)
+    DisplayReason displayReason,
+    ManagePasswordsIcon* icon)
     : ManagePasswordsBubble(webContents, displayReason),
+      icon_(icon),
       closing_(false),
       controller_(nil),
       webContents_(webContents),
       bridge_(nil) {
+  DCHECK(icon_);
+  icon_->SetActive(true);
 }
 
 ManagePasswordsBubbleCocoa::~ManagePasswordsBubbleCocoa() {
   [[NSNotificationCenter defaultCenter] removeObserver:bridge_];
   // Clear the global instance pointer.
   bubble_ = NULL;
+  if (icon_)
+    icon_->SetActive(false);
 }
 
 void ManagePasswordsBubbleCocoa::Show() {
   // Create and show the bubble.
   NSView* browserView = webContents_->GetNativeView();
   DCHECK(browserView);
   NSWindow* browserWindow = [browserView window];
   DCHECK(browserWindow);
   controller_ = [[ManagePasswordsBubbleController alloc]
       initWithParentWindow:browserWindow
@@ skipping 21 matching lines @@
     [controller_ close];
   }
 }
 
 void ManagePasswordsBubbleCocoa::OnClose() {
   delete this;
 }
 
 // static
 void ManagePasswordsBubbleCocoa::ShowBubble(content::WebContents* webContents,
-                                            DisplayReason displayReason) {
+                                            DisplayReason displayReason,
+                                            ManagePasswordsIcon* icon) {
   if (bubble_)
     return;
-  bubble_ = new ManagePasswordsBubbleCocoa(webContents, displayReason);
+  bubble_ = new ManagePasswordsBubbleCocoa(webContents, displayReason, icon);
   bubble_->Show();
 }