Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(502)

Unified Diff: chrome/browser/ui/cocoa/tabs/tab_window_controller.h

Issue 421883006: Merge 286045 "Revert of mac: Fix tab dragging visual bug in Yose..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2107/src/
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/fullscreen_window.mm ('k') | chrome/browser/ui/cocoa/tabs/tab_window_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/tabs/tab_window_controller.h
===================================================================
--- chrome/browser/ui/cocoa/tabs/tab_window_controller.h (revision 286078)
+++ chrome/browser/ui/cocoa/tabs/tab_window_controller.h (working copy)
@@ -23,19 +23,9 @@
@interface TabWindowController : NSWindowController<NSWindowDelegate> {
@private
- // Wrapper view around web content, and the developer tools view.
base::scoped_nsobject<FastResizeView> tabContentArea_;
-
- // The tab strip overlaps the titlebar of the window.
base::scoped_nsobject<TabStripView> tabStripView_;
- // In OSX 10.10+, all views must be added to the NSWindow's contentView. Some
- // views (like the tab strip and the profile icon) are placed on top of the
- // title bar and require special treatment. All other views should be added
- // as subviews of 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_;
@@ -48,7 +38,6 @@
}
@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;
« no previous file with comments | « chrome/browser/ui/cocoa/fullscreen_window.mm ('k') | chrome/browser/ui/cocoa/tabs/tab_window_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698