[Mac] Omnibox icons active states

chrome/browser/ui/cocoa/passwords/passwords_bubble_controller.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/passwords_bubble_controller.h"
 
 #include "base/mac/scoped_nsobject.h"
 #include "chrome/browser/ui/browser_finder.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
+#import "chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.h"
 #import "chrome/browser/ui/cocoa/passwords/auto_signin_view_controller.h"
 #import "chrome/browser/ui/cocoa/passwords/confirmation_password_saved_view_controller.h"
 #import "chrome/browser/ui/cocoa/passwords/manage_passwords_view_controller.h"
 #import "chrome/browser/ui/cocoa/passwords/save_pending_password_view_controller.h"
 #import "chrome/browser/ui/cocoa/passwords/signin_promo_view_controller.h"
 #import "chrome/browser/ui/cocoa/passwords/update_pending_password_view_controller.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/base/cocoa/window_size_constants.h"
 
 @interface ManagePasswordsBubbleController ()
 // Updates the content view controller according to the current state.
 - (void)updateState;
 @end
 
 @implementation ManagePasswordsBubbleController
 - (id)initWithParentWindow:(NSWindow*)parentWindow
                      model:(ManagePasswordsBubbleModel*)model {
   NSRect contentRect = ui::kWindowSizeDeterminedLater;
   base::scoped_nsobject<InfoBubbleWindow> window(
       [[InfoBubbleWindow alloc] initWithContentRect:contentRect
                                           styleMask:NSBorderlessWindowMask
                                             backing:NSBackingStoreBuffered
                                               defer:NO]);
   if ((self = [super initWithWindow:window
                        parentWindow:parentWindow
                          anchoredAt:NSZeroPoint])) {
     model_ = model;
+    Browser* browser = chrome::FindBrowserWithWindow([self parentWindow]);
+
+    bool hasLocationBar =
+        browser && browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR);
+
+    if (hasLocationBar) {
+      BrowserWindowController* controller = [BrowserWindowController
+          browserWindowControllerForWindow:parentWindow];
+      decoration_ =
+          [controller locationBarBridge]->manage_passwords_decoration();
+    }
+
     [self updateState];
   }
   return self;
 }
 
 - (void)dealloc {
   [currentController_ setDelegate:nil];
   [super dealloc];
 }
 
 - (void)showWindow:(id)sender {
   [self performLayout];
   [super showWindow:sender];
 }
 
 - (void)close {
   // The bubble is about to be closed. It destroys the model.
   model_ = nil;
   [super close];
 }
 
+- (LocationBarDecoration*)decorationForBubble {
+  return decoration_;

[Robert Sesek, 2016/11/28 22:46:59]

In all the other DecorationControllers, you don't store decoration_ but just
access it through this method. Can the same be done here?

[spqchan, 2016/11/29 17:34:49]

Done.

+}
+
 - (void)updateState {
   // Find the next view controller.
   [currentController_ setDelegate:nil];
   currentController_.reset();
   if (model_->state() == password_manager::ui::PENDING_PASSWORD_STATE) {
     currentController_.reset([[SavePendingPasswordViewController alloc]
         initWithDelegate:self]);
   } else if (model_->state() ==
              password_manager::ui::PENDING_PASSWORD_UPDATE_STATE) {
     currentController_.reset([[UpdatePendingPasswordViewController alloc]
@@ skipping 30 matching lines @@
 
   NSPoint anchorPoint;
   info_bubble::BubbleArrowLocation arrow;
   Browser* browser = chrome::FindBrowserWithWindow([self parentWindow]);
   bool hasLocationBar =
       browser && browser->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR);
 
   if (hasLocationBar) {
     BrowserWindowController* controller = [BrowserWindowController
         browserWindowControllerForWindow:[self parentWindow]];
-    anchorPoint =
-        [controller locationBarBridge]->GetManagePasswordsBubblePoint();
+    anchorPoint = [controller locationBarBridge]->GetBubblePointForDecoration(
+        decoration_);
     arrow = info_bubble::kTopRight;
   } else {
     // Center the bubble if there's no location bar.
     NSRect contentFrame = [[[self parentWindow] contentView] frame];
     anchorPoint = NSMakePoint(NSMidX(contentFrame), NSMaxY(contentFrame));
     arrow = info_bubble::kNoArrow;
   }
 
   // Update the anchor arrow.
   [[self bubble] setArrowLocation:arrow];
@@ skipping 50 matching lines @@
 
 @end
 
 @implementation ManagePasswordsBubbleController (Testing)
 
 - (NSViewController*)currentController {
   return currentController_.get();
 }
 
 @end