Reverting 24700.

chrome/browser/cocoa/status_bubble_mac.mm

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/cocoa/status_bubble_mac.h"
 
 #include "app/gfx/text_elider.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h"
-#import "third_party/GTM/AppKit/GTMNSColor+Luminance.h"
-#import "third_party/GTM/AppKit/GTMTheme.h"
 
 namespace {
 
 const int kWindowHeight = 18;
 // The width of the bubble in relation to the width of the parent window.
 const float kWindowWidthPercent = 1.0f/3.0f;
 
 // How close the mouse can get to the infobubble before it starts sliding
 // off-screen.
 const int kMousePadding = 20;
@@ skipping 20 matching lines @@
 enum BubbleStyle {
   STYLE_BOTTOM,    // Hanging off the bottom of the parent window
   STYLE_FLOATING,  // Between BOTTOM and STANDARD
   STYLE_STANDARD   // Nestled in the corner of the parent window
 };
 
 @interface StatusBubbleViewCocoa : NSView {
  @private
   NSString* content_;
   BubbleStyle style_;
-  NSWindow* parent_;
 }
 
 - (void)setContent:(NSString*)content;
 - (void)setStyle:(BubbleStyle)style;
-- (void)setParent:(NSWindow*)parent;
 - (NSFont*)font;
 @end
 
 StatusBubbleMac::StatusBubbleMac(NSWindow* parent, id delegate)
     : parent_(parent),
       delegate_(delegate),
       window_(nil),
       status_text_(nil),
       url_text_(nil),
       is_download_shelf_visible_(false) {
@@ skipping 147 matching lines @@
                                           backing:NSBackingStoreBuffered
                                             defer:YES];
   [window_ setMovableByWindowBackground:NO];
   [window_ setBackgroundColor:[NSColor clearColor]];
   [window_ setLevel:NSNormalWindowLevel];
   [window_ setOpaque:NO];
   [window_ setHasShadow:NO];
 
   StatusBubbleViewCocoa* view =
       [[[StatusBubbleViewCocoa alloc] initWithFrame:NSZeroRect] autorelease];
-  [view setParent:parent_];
-
   [window_ setContentView:view];
 
   [parent_ addChildWindow:window_ ordered:NSWindowAbove];
 
   [window_ setAlphaValue:0.0f];
 
   offset_ = 0;
   [view setStyle:STYLE_STANDARD];
   MouseMoved();
 }
@@ skipping 23 matching lines @@
   [content_ autorelease];
   content_ = [content copy];
   [self setNeedsDisplay:YES];
 }
 
 - (void)setStyle:(BubbleStyle)style {
   style_ = style;
   [self setNeedsDisplay:YES];
 }
 
-- (void)setParent:(NSWindow*)parent {
-  [parent_ autorelease];
-  parent_ = [parent retain];
-  [self setNeedsDisplay:YES];
-}
-
-- (GTMTheme*)gtm_theme {
-  return [parent_ gtm_theme];
-}
-
 - (NSFont*)font {
   return [NSFont systemFontOfSize:[NSFont smallSystemFontSize]];
 }
 
 - (void)drawRect:(NSRect)rect {
   float tl_radius, tr_radius, bl_radius, br_radius;
 
   switch (style_) {
     case STYLE_BOTTOM:
       tl_radius = 0.0f;
@@ skipping 17 matching lines @@
       NOTREACHED();
       tl_radius = 0.0f;
       tr_radius = 0.0f;
       bl_radius = 0.0f;
       br_radius = 0.0f;
   }
 
   // Background / Edge
 
   NSRect bounds = [self bounds];
-  bounds = NSInsetRect(bounds, 0.5, 0.5);
   NSBezierPath *border = [NSBezierPath gtm_bezierPathWithRoundRect:bounds
                                                topLeftCornerRadius:tl_radius
                                               topRightCornerRadius:tr_radius
                                             bottomLeftCornerRadius:bl_radius
                                            bottomRightCornerRadius:br_radius];
 
-  NSColor* color =
-      [[self gtm_theme] backgroundColorForStyle:GTMThemeStyleToolBar
-                                          state:GTMThemeStateActiveWindow];
-
-  // workaround for default theme
-  // TODO(alcor) next GTM update return nil for background color if not set;
-  if ([color isEqual:[NSColor colorWithCalibratedWhite:0.5 alpha:1.0]])
-    color = nil;
-  if (!color)
-    color = [NSColor colorWithCalibratedWhite:0.9 alpha:1.0];
-  [color set];
+  [[NSColor colorWithDeviceWhite:kWindowFill alpha:1.0f] set];
   [border fill];
 
   border = [NSBezierPath gtm_bezierPathWithRoundRect:bounds
                                  topLeftCornerRadius:tl_radius
                                 topRightCornerRadius:tr_radius
                               bottomLeftCornerRadius:bl_radius
                              bottomRightCornerRadius:br_radius];
 
   [[NSColor colorWithDeviceWhite:kWindowEdge alpha:1.0f] set];
   [border stroke];
 
   // Text
-  NSColor* textColor = [color gtm_legibleTextColor];
+
   NSFont* textFont = [self font];
   NSShadow* textShadow = [[[NSShadow alloc] init] autorelease];
-  [textShadow setShadowBlurRadius:0.0f];
-  [textShadow setShadowColor:[textColor gtm_legibleTextColor]];
+  [textShadow setShadowBlurRadius:1.5f];
+  [textShadow setShadowColor:[NSColor whiteColor]];
   [textShadow setShadowOffset:NSMakeSize(0.0f, -1.0f)];
 
   NSDictionary* textDict = [NSDictionary dictionaryWithObjectsAndKeys:
     textFont, NSFontAttributeName,
     textShadow, NSShadowAttributeName,
     nil];
   [content_ drawAtPoint:NSMakePoint(kTextPositionX, kTextPositionY)
          withAttributes:textDict];
 }
 
 @end