Mac: Update zoom bubble UI

chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller.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/action_box_menu_bubble_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/extensions/extension_icon_image.h"
 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
 #import "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #include "chrome/browser/ui/toolbar/action_box_menu_model.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
+#include "ui/native_theme/native_theme.h"
 
 @interface ActionBoxMenuBubbleController (Private)
 - (id)highlightedItem;
 - (void)keyDown:(NSEvent*)theEvent;
 - (void)moveDown:(id)sender;
 - (void)moveUp:(id)sender;
 - (void)highlightNextItemByDelta:(NSInteger)delta;
 - (void)highlightItem:(ActionBoxMenuItemController*)newItem;
 @end
 
@@ skipping 55 matching lines @@
          anchoredAt:(NSPoint)point
             profile:(Profile*)profile {
   // Use an arbitrary height because it will reflect the size of the content.
   NSRect contentRect = NSMakeRect(0, 0, kBubbleMinWidth, 150);
   // Create an empty window into which content is placed.
   scoped_nsobject<InfoBubbleWindow> window(
       [[InfoBubbleWindow alloc] initWithContentRect:contentRect
                                           styleMask:NSBorderlessWindowMask
                                             backing:NSBackingStoreBuffered
                                               defer:NO]);
+  [window setEnableAnimations:NO];
+  [window setDelayOnClose:NO];
   if (self = [super initWithWindow:window
                       parentWindow:parent
                         anchoredAt:point]) {
     profile_ = profile;
     model_.reset(model.release());
 
     [[self bubble] setAlignment:info_bubble::kAlignRightEdgeToAnchorEdge];
     [[self bubble] setArrowLocation:info_bubble::kNoArrow];
+    ui::NativeTheme *nativeTheme = ui::NativeTheme::instance();

[Robert Sesek, 2013/02/26 23:15:16]

nit: asterisk placement

[sail, 2013/02/27 00:35:34]

Done.

     [[self bubble] setBackgroundColor:
-        [NSColor colorWithDeviceWhite:(251.0f/255.0f)
-                                alpha:1.0]];
+        gfx::SkColorToCalibratedNSColor(nativeTheme->GetSystemColor(
+            ui::NativeTheme::kColorId_DialogBackground))];
     [self performLayout];
   }
   return self;
 }
 
 - (ActionBoxMenuModel*)model {
   return model_.get();
 }
 
 - (NSMutableArray*)items {
@@ skipping 29 matching lines @@
   CGFloat yOffset = kVerticalPadding;
 
   // Keep track of a potential separator to resize it when we know the width.
   scoped_nsobject<NSBox> separatorView;
 
   // Loop over the items in reverse, constructing the menu items.
   CGFloat width = kBubbleMinWidth;
   CGFloat minX = NSMinX([contentView bounds]);
   for (int i = model_->GetItemCount() - 1; i >= 0; --i) {
     if (model_->GetTypeAt(i) == ui::MenuModel::TYPE_SEPARATOR) {
+      const CGFloat kSeparatorHeight = 1.0;
       // Only supports one separator.
       DCHECK(!separatorView);
-      yOffset += kVerticalPadding;
+      yOffset += kVerticalPadding + kSeparatorHeight;
       separatorView.reset([[NSBox alloc]
-          initWithFrame:NSMakeRect(0, yOffset, width, 1)]);
-      [separatorView setBorderType:NSNoBorder];
+          initWithFrame:NSMakeRect(0, yOffset, width, kSeparatorHeight)]);
       [separatorView setBoxType:NSBoxCustom];
-      [separatorView setFillColor:[NSColor grayColor]];
+      ui::NativeTheme *nativeTheme = ui::NativeTheme::instance();
+      [separatorView setBorderColor:
+          gfx::SkColorToCalibratedNSColor(nativeTheme->GetSystemColor(
+              ui::NativeTheme::kColorId_MenuSeparatorColor))];
       [contentView addSubview:separatorView];
       yOffset += kVerticalPadding;
     } else {
       // Create the item controller. Autorelease it because it will be owned
       // by the |items_| array.
       scoped_nsobject<ActionBoxMenuItemController> itemController(
           [[ActionBoxMenuItemController alloc]
               initWithModelIndex:i
                   menuController:self
                          profile:profile_]);
@@ skipping 210 matching lines @@
   [viewController_ highlightForEvent:theEvent];
 }
 
 - (void)mouseExited:(NSEvent*)theEvent {
   [viewController_ highlightForEvent:theEvent];
 }
 
 - (void)drawRect:(NSRect)dirtyRect {
   NSColor* backgroundColor = nil;
   if ([viewController_ isHighlighted]) {
-    backgroundColor = [NSColor colorWithDeviceWhite:0.0 alpha:kSelectionAlpha];
+    ui::NativeTheme *nativeTheme = ui::NativeTheme::instance();
+    backgroundColor = gfx::SkColorToCalibratedNSColor(
+        nativeTheme->GetSystemColor(
+            ui::NativeTheme::kColorId_FocusedMenuItemBackgroundColor));
   } else {
     backgroundColor = [NSColor clearColor];
   }
 
   [backgroundColor set];
   [NSBezierPath fillRect:[self bounds]];
 }
 
 // Make sure the element is focusable for accessibility.
 - (BOOL)canBecomeKeyView {
@@ skipping 34 matching lines @@
 - (void)accessibilityPerformAction:(NSString*)action {
   if ([action isEqual:NSAccessibilityPressAction]) {
     [viewController_ itemSelected:self];
     return;
   }
 
   [super accessibilityPerformAction:action];
 }
 
 @end