diff --git a/browser/native_window_mac.h b/browser/native_window_mac.h
index ea359fa101b..ef3ed3a3839 100644
--- a/browser/native_window_mac.h
+++ b/browser/native_window_mac.h
@@ -63,6 +63,9 @@ class NativeWindowMac : public NativeWindow {
   // Called to handle a mouse event.
   void HandleMouseEvent(NSEvent* event);
 
+  // Clip web view to rounded corner.
+  void ClipWebView();
+
   NSWindow*& window() { return window_; }
   SkRegion* draggable_region() const { return draggable_region_.get(); }
 
diff --git a/browser/native_window_mac.mm b/browser/native_window_mac.mm
index 87fafd69f83..bfa615d6fe4 100644
--- a/browser/native_window_mac.mm
+++ b/browser/native_window_mac.mm
@@ -28,10 +28,6 @@
 - (void)setBottomCornerRounded:(BOOL)rounded;
 @end
 
-@interface NSView (WebContentsView)
-- (void)setMouseDownCanMoveWindow:(BOOL)can_move;
-@end
-
 @interface NSView (PrivateMethods)
 - (CGFloat)roundedCornerRadius;
 @end
@@ -55,6 +51,11 @@
   shell_->NotifyWindowBlur();
 }
 
+- (void)windowDidResize:(NSNotification*)otification {
+  if (!shell_->has_frame())
+    shell_->ClipWebView();
+}
+
 - (void)windowWillClose:(NSNotification*)notification {
   shell_->window() = nil;
   [self autorelease];
@@ -78,7 +79,7 @@
 @end
 
 @interface AtomNSWindow : AtomEventProcessingWindow {
- @private
+ @protected
   atom::NativeWindowMac* shell_;
 }
 - (void)setShell:(atom::NativeWindowMac*)shell;
@@ -113,32 +114,30 @@
   NSRectFill(rect);
 
   // Set up our clip.
-  CGFloat cornerRadius = 4.0;
-  if ([view respondsToSelector:@selector(roundedCornerRadius)])
-    cornerRadius = [view roundedCornerRadius];
+  CGFloat cornerRadius = 40.0;
+  // if ([view respondsToSelector:@selector(roundedCornerRadius)])
+  //   cornerRadius = [view roundedCornerRadius];
   [[NSBezierPath bezierPathWithRoundedRect:[view bounds]
                                    xRadius:cornerRadius
                                    yRadius:cornerRadius] addClip];
-  [[NSColor whiteColor] set];
+  [[NSColor clearColor] set];
   NSRectFill(rect);
 }
 
-+ (NSRect)frameRectForContentRect:(NSRect)contentRect
-                        styleMask:(NSUInteger)mask {
-  return contentRect;
+- (BOOL)canBecomeKeyWindow {
+  return YES;
 }
 
-+ (NSRect)contentRectForFrameRect:(NSRect)frameRect
-                        styleMask:(NSUInteger)mask {
-  return frameRect;
+- (BOOL)hasShadow {
+  return YES;
 }
 
-- (NSRect)frameRectForContentRect:(NSRect)contentRect {
-  return contentRect;
+- (void)keyDown:(NSEvent*)event {
+  [self redispatchKeyEvent:event];
 }
 
-- (NSRect)contentRectForFrameRect:(NSRect)frameRect {
-  return frameRect;
+- (void)keyUp:(NSEvent *)event {
+  [self redispatchKeyEvent:event];
 }
 
 @end
@@ -195,23 +194,29 @@ NativeWindowMac::NativeWindowMac(content::WebContents* web_contents,
       (NSHeight(main_screen_rect) - height) / 2,
       width,
       height);
+
+  AtomNSWindow* atomWindow;
   NSUInteger style_mask = NSTitledWindowMask | NSClosableWindowMask |
                           NSMiniaturizableWindowMask | NSResizableWindowMask |
                           NSTexturedBackgroundWindowMask;
-  AtomNSWindow* atom_window = has_frame_ ?
-    [[AtomNSWindow alloc]
-      initWithContentRect:cocoa_bounds
-                styleMask:style_mask
-                  backing:NSBackingStoreBuffered
-                    defer:YES] :
-    [[AtomFramelessNSWindow alloc]
-      initWithContentRect:cocoa_bounds
-                styleMask:style_mask
-                  backing:NSBackingStoreBuffered
-                    defer:YES];
-  [atom_window setShell:this];
+  if (has_frame_) {
+    atomWindow = [[AtomNSWindow alloc]
+        initWithContentRect:cocoa_bounds
+                  styleMask:style_mask
+                    backing:NSBackingStoreBuffered
+                      defer:YES];
+  } else {
+    atomWindow = [[AtomFramelessNSWindow alloc]
+        initWithContentRect:cocoa_bounds
+                  styleMask:style_mask
+                    backing:NSBackingStoreBuffered
+                      defer:YES];
+    [atomWindow setBottomCornerRounded:YES];
+  }
+
+  [atomWindow setShell:this];
+  window_ = atomWindow;
 
-  window_ = atom_window;
   [window() setDelegate:[[AtomNSWindowDelegate alloc] initWithShell:this]];
 
   // Disable fullscreen button when 'fullscreen' is specified to false.
@@ -434,7 +439,7 @@ gfx::NativeWindow NativeWindowMac::GetNativeWindow() {
 bool NativeWindowMac::IsWithinDraggableRegion(NSPoint point) const {
   if (!draggable_region_)
     return false;
-  NSView* webView = web_contents()->GetView()->GetNativeView();
+  NSView* webView = GetWebContents()->GetView()->GetNativeView();
   NSInteger webViewHeight = NSHeight([webView bounds]);
   // |draggable_region_| is stored in local platform-indepdent coordiate system
   // while |point| is in local Cocoa coordinate system. Do the conversion
@@ -491,6 +496,8 @@ void NativeWindowMac::InstallView() {
     [view setFrame:[frameView bounds]];
     [frameView addSubview:view];
 
+    ClipWebView();
+
     [[window() standardWindowButton:NSWindowZoomButton] setHidden:YES];
     [[window() standardWindowButton:NSWindowMiniaturizeButton] setHidden:YES];
     [[window() standardWindowButton:NSWindowCloseButton] setHidden:YES];
@@ -503,6 +510,18 @@ void NativeWindowMac::UninstallView() {
   [view removeFromSuperview];
 }
 
+void NativeWindowMac::ClipWebView() {
+  NSView* view = GetWebContents()->GetView()->GetNativeView();
+
+  CGFloat cornerRadius = 40.0;
+  // if ([view respondsToSelector:@selector(roundedCornerRadius)])
+  //   cornerRadius = [view roundedCornerRadius];
+
+  view.wantsLayer = YES;
+  view.layer.masksToBounds = YES;
+  view.layer.cornerRadius = cornerRadius;
+}
+
 void NativeWindowMac::InstallDraggableRegionViews() {
   DCHECK(!has_frame_);