Always set NSTexturedBackgroundWindowMask on app windows.

This is consistent with FramedBrowserWindow.

This also skips drawing the frame of frameless windows.

On OSX 10.7, if NSTexturedBackgroundWindowMask is set, NSGrayFrame is
used to draw the frame. If not, NSThemeFrame is used. Since we swizzle
drawing methods on NSGrayFrame on 10.7, the app windows should all use
NSGrayFrame.

BUG=378581

Review URL: https://codereview.chromium.org/307843002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273781 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h

@@ -168,9 +168,7 @@ class NativeAppWindowCocoa : public apps::NativeAppWindow,
   content::WebContents* WebContents() const;
 
   // Returns the WindowStyleMask based on the type of window frame.
-  // Specifically, this includes NSResizableWindowMask if the window is
-  // resizable, and does not include NSTexturedBackgroundWindowMask when a
-  // native frame is used.
+  // This includes NSResizableWindowMask if the window is resizable.
   NSUInteger GetWindowStyleMask() const;
 
   void InstallView();

chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm

@@ -11,6 +11,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/cocoa/browser_window_utils.h"
 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
+#import "chrome/browser/ui/cocoa/custom_frame_view.h"
 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h"
 #include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h"
 #import "chrome/browser/ui/cocoa/nsview_additions.h"
@@ -223,9 +224,6 @@ std::vector<gfx::Rect> CalculateNonDraggableRegions(
 @end
 
 @interface ShellCustomFrameNSWindow : ShellNSWindow
-
-- (void)drawCustomFrameRect:(NSRect)rect forView:(NSView*)view;
-
 @end
 
 @implementation ShellCustomFrameNSWindow
@@ -248,12 +246,13 @@ std::vector<gfx::Rect> CalculateNonDraggableRegions(
 
 @end
 
-@interface ShellFramelessNSWindow : ShellCustomFrameNSWindow
-
+@interface ShellFramelessNSWindow : ShellNSWindow
 @end
 
 @implementation ShellFramelessNSWindow
 
+- (void)drawCustomFrameRect:(NSRect)rect forView:(NSView*)view {}
+
 + (NSRect)frameRectForContentRect:(NSRect)contentRect
                         styleMask:(NSUInteger)mask {
   return contentRect;
@@ -373,14 +372,10 @@ NativeAppWindowCocoa::NativeAppWindowCocoa(
 
 NSUInteger NativeAppWindowCocoa::GetWindowStyleMask() const {
   NSUInteger style_mask = NSTitledWindowMask | NSClosableWindowMask |
-                          NSMiniaturizableWindowMask;
+                          NSMiniaturizableWindowMask |
+                          NSTexturedBackgroundWindowMask;
   if (shows_resize_controls_)
     style_mask |= NSResizableWindowMask;
-  if (!has_frame_ ||
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kAppsUseNativeFrame)) {
-    style_mask |= NSTexturedBackgroundWindowMask;
-  }
   return style_mask;
 }