mac: Use a full-size content view (reland 1).

chrome/browser/ui/cocoa/tabs/tab_window_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_TABS_TAB_WINDOW_CONTROLLER_H_
 #define CHROME_BROWSER_UI_COCOA_TABS_TAB_WINDOW_CONTROLLER_H_
 
 // A class acting as the Objective-C window controller for a window that has
 // tabs which can be dragged around. Tabs can be re-arranged within the same
 // window or dragged into other TabWindowController windows. This class doesn't
 // know anything about the actual tab implementation or model, as that is fairly
 // application-specific. It only provides an API to be overridden by subclasses
 // to fill in the details.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsobject.h"
 
 @class FastResizeView;
 @class FocusTracker;
 @class TabStripView;
 @class TabView;
 
 @interface TabWindowController : NSWindowController<NSWindowDelegate> {
  @private
+  // Wrapper view around web content, and the developer tools view.
   base::scoped_nsobject<FastResizeView> tabContentArea_;
   base::scoped_nsobject<NSView> tabStripBackgroundView_;
+
+  // The tab strip overlaps the titlebar of the window.
   base::scoped_nsobject<TabStripView> tabStripView_;
 
+  // No views should be added directly to the root view. Views that overlap
+  // the title bar should be added to the window's contentView. All other views
+  // should be added to chromeContentView_. This allows tab dragging and
+  // fullscreen logic to easily move the views that don't need special
+  // treatment.
+  base::scoped_nsobject<NSView> chromeContentView_;
+
   // The child window used during dragging to achieve the opacity tricks.
   NSWindow* overlayWindow_;
 
   // The contentView of the original window that is moved (for the duration
   // of the drag) to the |overlayWindow_|.
   NSView* originalContentView_;  // weak
 
   base::scoped_nsobject<FocusTracker> focusBeforeOverlay_;
   BOOL closeDeferred_;  // If YES, call performClose: in removeOverlay:.
 }
 @property(readonly, nonatomic) NSView* tabStripBackgroundView;
 @property(readonly, nonatomic) TabStripView* tabStripView;
 @property(readonly, nonatomic) FastResizeView* tabContentArea;
+@property(readonly, nonatomic) NSView* chromeContentView;
 
 // This is the designated initializer for this class.
 - (id)initTabWindowControllerWithTabStrip:(BOOL)hasTabStrip;
 
 // Used during tab dragging to turn on/off the overlay window when a tab
 // is torn off. If -deferPerformClose (below) is used, -removeOverlay will
 // cause the controller to be autoreleased before returning.
 - (void)showOverlay;
 - (void)removeOverlay;
 - (NSWindow*)overlayWindow;
@@ skipping 97 matching lines @@
 // does not mess with the NSThemeFrame. Chrome must manually enforce these
 // constraints.
 //
 // Immediately after creation of the window, or after the window's content view
 // is changed, the content view must be moved to the back.
 - (void)moveContentViewToBack:(NSView*)contentView;
 
 // The tab strip should always be inserted directly above the content view.
 - (void)insertTabStripView:(NSView*)tabStripView intoWindow:(NSWindow*)window;
 
+// The tab strip background view should always be inserted as the back-most
+// subview of the root view. It cannot be a subview of the contentView, as that
+// would cause it to become layer backed, which would cause it to draw on top
+// of non-layer backed content like the window controls.
+- (void)insertTabStripBackgroundViewIntoWindow:(NSWindow*)window;

[Andre, 2014/10/09 23:15:48]

Make this private, since the external caller is not needed anymore.

[erikchen, 2014/10/10 00:47:45]

Done.

+
 @end
 
 @interface TabWindowController(ProtectedMethods)
 // Tells the tab strip to forget about this tab in preparation for it being
 // put into a different tab strip, such as during a drop on another window.
 - (void)detachTabView:(NSView*)view;
 
 // Called when the size of the window content area has changed. Override to
 // position specific views. Base class implementation does nothing.
 - (void)layoutSubviews;
 @end
 
 #endif  // CHROME_BROWSER_UI_COCOA_TABS_TAB_WINDOW_CONTROLLER_H_