summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
diff options
context:
space:
mode:
authorerikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-29 01:39:22 +0000
committererikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-29 01:39:22 +0000
commit4aaa11f0953ab1f54fb234a624b9ec0a099e7a94 (patch)
treee31ff25981e8a20f0e714f79a8012de6eccf2e46 /chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
parent73249a262d36d4fbc8d40d5b386e161649345cdf (diff)
downloadchromium_src-4aaa11f0953ab1f54fb234a624b9ec0a099e7a94.zip
chromium_src-4aaa11f0953ab1f54fb234a624b9ec0a099e7a94.tar.gz
chromium_src-4aaa11f0953ab1f54fb234a624b9ec0a099e7a94.tar.bz2
Revert of mac: Fix tab dragging visual bug in Yosemite. (reland 2) (https://codereview.chromium.org/399803002/)
Reason for revert: NSInvalidArgumentException reason Unlocking Focus on wrong view (<NSView: 0x#>), expected <FastResizeView: 0x#> https://code.google.com/p/chromium/issues/detail?id=397089 Original issue's description: > mac: Fix tab dragging visual bug in Yosemite. (reland 2) > -----------------Reland 2 Description------------------ > Turned on layers for the test for fullscreen windows. > > -----------------Reland 1 Description------------------ > Reland 1 link: https://codereview.chromium.org/393933003/ > Core animation was turned on in M35. The fullscreen window was not layer > backed, but should have been. This original CL exposed this bug. > > -----------------Original Description------------------ > Original CL link: https://codereview.chromium.org/379293003/ > > 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 are added as subviews of > 'chromeContentView' in TabWindowController. This allows tab dragging and > fullscreen logic to easily move the views that don't need special treatment. > > This CL also removes the instances where a VersionIndependentWindow's > contentView gets replaced by setContentView:. Instead, the 'chromeContentView' > gets passed around as a subview. This allows VersionIndependentWindow to remove > another of its internal hacks. > > BUG=392239 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=283650 TBR=shess@chromium.org NOTREECHECKS=true NOTRY=true BUG=392239 Review URL: https://codereview.chromium.org/423013005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286045 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/browser_window_controller_unittest.mm')
-rw-r--r--chrome/browser/ui/cocoa/browser_window_controller_unittest.mm4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
index 269fa15..15f09a9 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
@@ -21,7 +21,6 @@
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
#include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
-#import "chrome/browser/ui/cocoa/nsview_additions.h"
#include "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
#include "chrome/browser/ui/host_desktop.h"
@@ -616,7 +615,7 @@ TEST_F(BrowserWindowControllerTest, TestFindBarOnTop) {
[controller_ addFindBar:bridge.find_bar_cocoa_controller()];
// Test that the Z-order of the find bar is on top of everything.
- NSArray* subviews = [controller_.chromeContentView subviews];
+ NSArray* subviews = [[[controller_ window] contentView] subviews];
NSUInteger findBar_index =
[subviews indexOfObject:[controller_ findBarView]];
EXPECT_NE(NSNotFound, findBar_index);
@@ -883,7 +882,6 @@ TEST_F(BrowserWindowFullScreenControllerTest, DISABLED_TestActivate) {
styleMask:NSBorderlessWindowMask
backing:NSBackingStoreBuffered
defer:NO]);
- [[testFullscreenWindow_ contentView] cr_setWantsLayer:YES];
return testFullscreenWindow_.get();
}
@end