[MacViews] Implement colored window frames.

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

 // Copyright 2013 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/ui/cocoa/apps/native_app_window_cocoa.h"
 
 #include "base/command_line.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h"
 #include "chrome/browser/profiles/profile.h"
+#import "chrome/browser/ui/cocoa/apps/titlebar_background_view.h"
 #include "chrome/browser/ui/cocoa/browser_window_utils.h"
 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h"
 #include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/extension.h"
 #include "skia/ext/skia_utils_mac.h"
@@ skipping 168 matching lines @@
 
 - (BOOL)handledByExtensionCommand:(NSEvent*)event
     priority:(ui::AcceleratorManager::HandlerPriority)priority {
   if (appWindow_)
     return appWindow_->HandledByExtensionCommand(event, priority);
   return NO;
 }
 
 @end
 
-// A view that paints a solid color. Used to change the title bar background.
-@interface TitlebarBackgroundView : NSView {
- @private
-  base::scoped_nsobject<NSColor> color_;
-  base::scoped_nsobject<NSColor> inactiveColor_;
-}
-- (void)setColor:(NSColor*)color
-    inactiveColor:(NSColor*)inactiveColor;
-@end
-
-@implementation TitlebarBackgroundView
-
-- (void)drawRect:(NSRect)rect {
-  // Only the top corners are rounded. For simplicity, round all 4 corners but
-  // draw the bottom corners outside of the visible bounds.
-  CGFloat cornerRadius = 4.0;
-  NSRect roundedRect = [self bounds];
-  roundedRect.origin.y -= cornerRadius;
-  roundedRect.size.height += cornerRadius;
-  [[NSBezierPath bezierPathWithRoundedRect:roundedRect
-                                   xRadius:cornerRadius
-                                   yRadius:cornerRadius] addClip];
-  if ([[self window] isMainWindow] || [[self window] isKeyWindow])
-    [color_ set];
-  else
-    [inactiveColor_ set];
-  NSRectFill(rect);
-}
-
-- (void)setColor:(NSColor*)color
-    inactiveColor:(NSColor*)inactiveColor {
-  color_.reset([color retain]);
-  inactiveColor_.reset([inactiveColor retain]);
-}
-
-@end
-
-// TODO(jamescook): Should these be AppNSWindow to match AppWindow?
-// http://crbug.com/344082
 @interface AppNSWindow : ChromeEventProcessingWindow
 @end
 
 @implementation AppNSWindow
 
 // Similar to ChromeBrowserWindow, don't draw the title, but allow it to be seen
 // in menus, Expose, etc.
 - (BOOL)_isTitleHidden {
   return YES;
 }
@@ skipping 74 matching lines @@
                   backing:NSBackingStoreBuffered
                     defer:NO]);
 
   std::string name;
   const extensions::Extension* extension = app_window_->GetExtension();
   if (extension)
     name = extension->name();
   [window setTitle:base::SysUTF8ToNSString(name)];
   [[window contentView] setWantsLayer:YES];
   if (has_frame_ && has_frame_color_) {
-    // AppKit only officially supports adding subviews to the window's
-    // contentView and not its superview (an NSNextStepFrame). The 10.10 SDK
-    // allows adding an NSTitlebarAccessoryViewController to a window, but the
-    // view can only be placed above the window control buttons, so we'd have to
-    // replicate those.
-    NSView* window_view = [[window contentView] superview];
-    CGFloat height = NSHeight([window_view bounds]) -
-                     NSHeight([[window contentView] bounds]);
-    titlebar_background_view_.reset([[TitlebarBackgroundView alloc]
-        initWithFrame:NSMakeRect(0, NSMaxY([window_view bounds]) - height,
-                                 NSWidth([window_view bounds]), height)]);
-    [titlebar_background_view_
-        setAutoresizingMask:NSViewWidthSizable | NSViewMinYMargin];
-    [window_view addSubview:titlebar_background_view_
-                 positioned:NSWindowBelow
-                 relativeTo:nil];
-    [titlebar_background_view_
-             setColor:gfx::SkColorToSRGBNSColor(active_frame_color_)
-        inactiveColor:gfx::SkColorToSRGBNSColor(inactive_frame_color_)];
+    [TitlebarBackgroundView addToNSWindow:window
+                              activeColor:active_frame_color_
+                            inactiveColor:inactive_frame_color_];
   }
 
   if (base::mac::IsOSSnowLeopard() &&
       [window respondsToSelector:@selector(setBottomCornerRounded:)])
     [window setBottomCornerRounded:NO];
 
   if (params.always_on_top)
     [window setLevel:AlwaysOnTopWindowLevel()];
   InitCollectionBehavior(window);
 
@@ skipping 417 matching lines @@
   NOTIMPLEMENTED();
 }
 
 void NativeAppWindowCocoa::WindowWillClose() {
   [window_controller_ setAppWindow:NULL];
   app_window_->OnNativeWindowChanged();
   app_window_->OnNativeClose();
 }
 
 void NativeAppWindowCocoa::WindowDidBecomeKey() {
-  [titlebar_background_view_ setNeedsDisplay:YES];
   content::RenderWidgetHostView* rwhv =
       WebContents()->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetActive(true);
   app_window_->OnNativeWindowActivated();
 
   WebContents()->RestoreFocus();
 }
 
 void NativeAppWindowCocoa::WindowDidResignKey() {
   // If our app is still active and we're still the key window, ignore this
   // message, since it just means that a menu extra (on the "system status bar")
   // was activated; we'll get another |-windowDidResignKey| if we ever really
   // lose key window status.
   if ([NSApp isActive] && ([NSApp keyWindow] == window()))
     return;
 
-  [titlebar_background_view_ setNeedsDisplay:YES];
-
   WebContents()->StoreFocus();
 
   content::RenderWidgetHostView* rwhv =
       WebContents()->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetActive(false);
 }
 
 void NativeAppWindowCocoa::WindowDidFinishResize() {
   // Update |is_maximized_| if needed:
@@ skipping 129 matching lines @@
 }
 
 void NativeAppWindowCocoa::UpdateRestoredBounds() {
   if (IsRestored(*this))
     restored_bounds_ = [window() frame];
 }
 
 void NativeAppWindowCocoa::HideWithoutMarkingHidden() {
   [window() orderOut:window_controller_];
 }