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

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

 // Copyright 2012 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/location_bar/location_bar_view_mac.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ skipping 113 matching lines @@
           new EVBubbleDecoration(location_icon_decoration_.get())),
       star_decoration_(new StarDecoration(command_updater)),
       translate_decoration_(new TranslateDecoration(command_updater)),
       zoom_decoration_(new ZoomDecoration(this)),
       keyword_hint_decoration_(new KeywordHintDecoration()),
       mic_search_decoration_(new MicSearchDecoration(command_updater)),
       generated_credit_card_decoration_(
           new GeneratedCreditCardDecoration(this)),
       search_button_decoration_(new SearchButtonDecoration(this)),
       manage_passwords_decoration_(
-          new ManagePasswordsDecoration(command_updater)),
+          new ManagePasswordsDecoration(command_updater, this)),
       browser_(browser),
       weak_ptr_factory_(this) {
   for (size_t i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
     DCHECK_EQ(i, content_setting_decorations_.size());
     ContentSettingsType type = static_cast<ContentSettingsType>(i);
     content_setting_decorations_.push_back(
         new ContentSettingDecoration(type, this, profile));
   }
 
   edit_bookmarks_enabled_.Init(
@@ skipping 56 matching lines @@
   if (RefreshContentSettingsDecorations())
     OnDecorationsChanged();
 }
 
 void LocationBarViewMac::UpdateManagePasswordsIconAndBubble() {
   WebContents* web_contents = GetWebContents();
   if (!web_contents)
     return;
   ManagePasswordsUIController::FromWebContents(web_contents)
       ->UpdateIconAndBubbleState(manage_passwords_decoration_->icon());
+  OnDecorationsChanged();
 }
 
 void LocationBarViewMac::UpdatePageActions() {
   RefreshPageActionDecorations();
   Layout();
 
   [field_ updateMouseTracking];
   [field_ setNeedsDisplay:YES];
 }
 
@@ skipping 298 matching lines @@
     // near the top left corner (unanchored).
     NOTREACHED();
     return NSZeroPoint;
   }
 
   NSPoint bubble_point = decoration->GetBubblePointInFrame(frame);
   return [field_ convertPoint:bubble_point toView:nil];
 }
 
 void LocationBarViewMac::Update(const WebContents* contents) {
+  UpdateManagePasswordsIconAndBubble();
   UpdateStarDecorationVisibility();
   UpdateTranslateDecoration();
   UpdateZoomDecoration();
   RefreshPageActionDecorations();
   RefreshContentSettingsDecorations();
   UpdateMicSearchDecorationVisibility();
   UpdateGeneratedCreditCardView();
   if (contents)
     omnibox_view_->OnTabChanged(contents);
   else
@@ skipping 220 matching lines @@
 }
 
 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() {
   bool is_visible = !GetToolbarModel()->input_in_progress() &&
                     browser_->search_model()->voice_search_supported();
   if (mic_search_decoration_->IsVisible() == is_visible)
     return false;
   mic_search_decoration_->SetVisible(is_visible);
   return true;
 }