[Mac] Omnibox icons active states

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

 // Copyright (c) 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/content_setting_decoration.h"
 
 #include <algorithm>
 
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 294 matching lines @@
 
   if (chrome::ToolkitViewsDialogsEnabled()) {
     gfx::Point origin = gfx::ScreenPointFromNSPoint(anchor);
     chrome::ContentSettingBubbleViewsBridge::Show(
         [web_contents->GetTopLevelNativeWindow() contentView],
         model, web_contents, origin);
   } else {
     [ContentSettingBubbleController showForModel:model
                                      webContents:web_contents
                                     parentWindow:[field window]
+                                      decoration:this
                                       anchoredAt:anchor];
   }
 
   return true;
 }
 
 NSString* ContentSettingDecoration::GetToolTip() {
   return tooltip_.get();
 }
 
@@ skipping 54 matching lines @@
       ImageDecoration::DrawInFrame(icon_rect, control_view);
     }
 
     NSRect remainder = frame;
     remainder.origin.x = NSMaxX(icon_rect) + kTextMarginPadding;
     remainder.size.width =
         NSMaxX(background_rect) - NSMinX(remainder) - kTextDividerPadding;
     DrawAttributedString(animated_text_, remainder);
 
     // Draw the divider if available.
-    if (state() == LocationBarDecorationState::NORMAL) {
+    if (state() == DecorationMouseState::NONE && !active()) {
       NSBezierPath* line = [NSBezierPath bezierPath];
       [line setLineWidth:1];
       [line moveToPoint:NSMakePoint(NSMaxX(background_rect) - kDividerPadding,
                                     NSMinY(background_rect))];
       [line lineToPoint:NSMakePoint(NSMaxX(background_rect) - kDividerPadding,
                                     NSMaxY(background_rect))];
       [GetDividerColor(owner_->IsLocationBarDark()) set];
       [line stroke];
     }
   } else {
     // No animation, draw the image as normal.
     ImageDecoration::DrawInFrame(frame, control_view);
   }
 }
 
 void ContentSettingDecoration::AnimationTimerFired() {
   owner_->Layout();
   // Even after the animation completes, the |animator_| object should be kept
   // alive to prevent the animation from re-appearing if the page opens
   // additional popups later. The animator will be cleared when the decoration
   // hides, indicating something has changed with the WebContents (probably
   // navigation).
 }