diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-23 19:12:40 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-23 19:12:40 +0000 |
| commit | 7b1a7c1204c4aca7717f15fffb21f5d0f5319ed1 (patch) | |
| tree | 100f7212644da8136ceefbeacf16f312cc8b7960 /chrome | |
| parent | be892f97de9174e762111faceb54e3b082aea449 (diff) | |
| download | chromium_src-7b1a7c1204c4aca7717f15fffb21f5d0f5319ed1.zip chromium_src-7b1a7c1204c4aca7717f15fffb21f5d0f5319ed1.tar.gz chromium_src-7b1a7c1204c4aca7717f15fffb21f5d0f5319ed1.tar.bz2 | |
Fix issue where dragging window via a tab would incorrectly dim chrome when there were no other windows as drag targets, but only the first time.
BUG=11125
TEST=dragging tabs in and out of windows should show consistent feedback.
Review URL: http://codereview.chromium.org/160018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/cocoa/tab_view.mm | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/tab_window_controller.mm | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/tab_view.mm b/chrome/browser/cocoa/tab_view.mm index a078fa4..4f956e2 100644 --- a/chrome/browser/cocoa/tab_view.mm +++ b/chrome/browser/cocoa/tab_view.mm @@ -23,6 +23,7 @@ static const CGFloat kToolbarMaxHeight = 128; - (id)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; if (self) { + chromeIsVisible_ = YES; [self setShowsDivider:NO]; // TODO(alcor): register for theming, either here or the cell // [self gtm_registerForThemeNotifications]; @@ -374,6 +375,7 @@ static const double kDragStartDistance = 3.0; [draggedController_ layoutTabs]; } [sourceController_ removePlaceholder]; + chromeIsVisible_ = YES; } - (void)otherMouseUp:(NSEvent*)theEvent { diff --git a/chrome/browser/cocoa/tab_window_controller.mm b/chrome/browser/cocoa/tab_window_controller.mm index b9c9479..a1a308c 100644 --- a/chrome/browser/cocoa/tab_window_controller.mm +++ b/chrome/browser/cocoa/tab_window_controller.mm @@ -102,6 +102,8 @@ [overlayWindow_ release]; overlayWindow_ = nil; cachedContentView_ = nil; + } else { + NOTREACHED(); } } |