Fix window shadows.

chrome/browser/ui/cocoa/browser_frame_view.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/browser_frame_view.h"
 
 #import <objc/runtime.h>
 #import <Carbon/Carbon.h>
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #import "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 
 static const CGFloat kBrowserFrameViewPaintHeight = 60.0;
 static const NSPoint kBrowserFrameViewPatternPhaseOffset = { -5, 3 };
 
 static BOOL gCanDrawTitle = NO;
 static BOOL gCanGetCornerRadius = NO;
 
 @interface NSView (Swizzles)
 - (void)drawRectOriginal:(NSRect)rect;
-- (NSUInteger)_shadowFlagsOriginal;
 @end
 
 // Undocumented APIs. They are really on NSGrayFrame rather than
 // BrowserFrameView, but we call them from methods swizzled onto NSGrayFrame.
 @interface BrowserFrameView (UndocumentedAPI)
 
 - (float)roundedCornerRadius;
 - (CGRect)_titlebarTitleRect;
 - (void)_drawTitleStringIn:(struct CGRect)arg1 withColor:(id)color;
-- (NSUInteger)_shadowFlags;
 
 @end
 
 @implementation BrowserFrameView
 
 + (void)load {
   // This is where we swizzle drawRect, and add in two methods that we
   // need. If any of these fail it shouldn't affect the functionality of the
   // others. If they all fail, we will lose window frame theming and
   // roll overs for our close widgets, but things should still function
@@ skipping 29 matching lines @@
   }
 
   gCanDrawTitle =
       [borderViewClass
         instancesRespondToSelector:@selector(_titlebarTitleRect)] &&
       [borderViewClass
         instancesRespondToSelector:@selector(_drawTitleStringIn:withColor:)];
   gCanGetCornerRadius =
       [borderViewClass
         instancesRespondToSelector:@selector(roundedCornerRadius)];
-
-  // Add _shadowFlags. This is a method on NSThemeFrame, not on NSGrayFrame.
-  // NSThemeFrame is NSGrayFrame's superclass.
-  Class themeFrameClass = NSClassFromString(@"NSThemeFrame");
-  DCHECK(themeFrameClass);
-  if (!themeFrameClass) return;
-  m0 = class_getInstanceMethod([self class], @selector(_shadowFlags));
-  DCHECK(m0);
-  if (m0) {
-    BOOL didAdd = class_addMethod(themeFrameClass,
-                                  @selector(_shadowFlagsOriginal),
-                                  method_getImplementation(m0),
-                                  method_getTypeEncoding(m0));
-    DCHECK(didAdd);
-    if (didAdd) {
-      Method m1 = class_getInstanceMethod(themeFrameClass,
-                                          @selector(_shadowFlags));
-      Method m2 = class_getInstanceMethod(themeFrameClass,
-                                          @selector(_shadowFlagsOriginal));
-      DCHECK(m1 && m2);
-      if (m1 && m2) {
-        method_exchangeImplementations(m1, m2);
-      }
-    }
-  }
 }
 
 - (id)initWithFrame:(NSRect)frame {
   // This class is not for instantiating.
   [self doesNotRecognizeSelector:_cmd];
   return nil;
 }
 
 - (id)initWithCoder:(NSCoder*)coder {
   // This class is not for instantiating.
@@ skipping 207 matching lines @@
 
   if (titleColor)
     return titleColor;
 
   if (incognito)
     return [NSColor whiteColor];
   else
     return [NSColor windowFrameTextColor];
 }
 
-// When the compositor is active, the whole content area is transparent (with
-// an OpenGL surface behind it), so Cocoa draws the shadow only around the
-// toolbar area.
-// Tell the window server that we want a shadow as if none of the content
-// area is transparent.
-- (NSUInteger)_shadowFlags {
-  // A slightly less intrusive hack would be to call
-  // _setContentHasShadow:NO on the window. That seems to be what Terminal.app
-  // is doing. However, it leads to this function returning 'code | 64', which
-  // doesn't do what we want. For some reason, it does the right thing in
-  // Terminal.app.
-  // TODO(thakis): Figure out why -_setContentHasShadow: works in Terminal.app
-  // and use that technique instead. http://crbug.com/53382
-
-  // If this isn't the window class we expect, then pass it on to the
-  // original implementation.
-  if (![[self window] isKindOfClass:[FramedBrowserWindow class]])
-    return [self _shadowFlagsOriginal];
-
-  return [self _shadowFlagsOriginal] | 128;
-}
-
 @end