| Index: ui/base/cocoa/underlay_opengl_hosting_window.mm
|
| diff --git a/ui/base/cocoa/underlay_opengl_hosting_window.mm b/ui/base/cocoa/underlay_opengl_hosting_window.mm
|
| index 3069bd275bb4e6a2525388c4949be2415f18298e..1e562e200b76d3e839422fec4acbf536d3cfc95b 100644
|
| --- a/ui/base/cocoa/underlay_opengl_hosting_window.mm
|
| +++ b/ui/base/cocoa/underlay_opengl_hosting_window.mm
|
| @@ -9,7 +9,7 @@
|
| #include "base/logging.h"
|
| #include "base/mac/mac_util.h"
|
| #include "base/mac/scoped_nsautorelease_pool.h"
|
| -#include "base/memory/scoped_nsobject.h"
|
| +#include "base/mac/scoped_nsobject.h"
|
|
|
| @interface NSWindow (UndocumentedAPI)
|
| // Normally, punching a hole in a window by painting a subview with a
|
| @@ -121,17 +121,21 @@ NSComparisonResult OpaqueViewsOnTop(id view1, id view2, void* context) {
|
| const CGFloat kTopEdgeInset = 16;
|
| const CGFloat kAlphaValueJustOpaqueEnough = 0.005;
|
|
|
| - scoped_nsobject<NSView> leftOpaque([[OpaqueView alloc] initWithFrame:
|
| - NSMakeRect(NSMinX(rootBounds), NSMinY(rootBounds),
|
| - 1, NSHeight(rootBounds) - kTopEdgeInset)]);
|
| + base::scoped_nsobject<NSView> leftOpaque([[OpaqueView alloc]
|
| + initWithFrame:NSMakeRect(NSMinX(rootBounds),
|
| + NSMinY(rootBounds),
|
| + 1,
|
| + NSHeight(rootBounds) - kTopEdgeInset)]);
|
| [leftOpaque setAutoresizingMask:NSViewMaxXMargin |
|
| NSViewHeightSizable];
|
| [leftOpaque setAlphaValue:kAlphaValueJustOpaqueEnough];
|
| [rootView addSubview:leftOpaque];
|
|
|
| - scoped_nsobject<NSView> rightOpaque([[OpaqueView alloc] initWithFrame:
|
| - NSMakeRect(NSMaxX(rootBounds) - 1, NSMinY(rootBounds),
|
| - 1, NSHeight(rootBounds) - kTopEdgeInset)]);
|
| + base::scoped_nsobject<NSView> rightOpaque([[OpaqueView alloc]
|
| + initWithFrame:NSMakeRect(NSMaxX(rootBounds) - 1,
|
| + NSMinY(rootBounds),
|
| + 1,
|
| + NSHeight(rootBounds) - kTopEdgeInset)]);
|
| [rightOpaque setAutoresizingMask:NSViewMinXMargin |
|
| NSViewHeightSizable];
|
| [rightOpaque setAlphaValue:kAlphaValueJustOpaqueEnough];
|
|
|