summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandresantoso <andresantoso@chromium.org>2014-10-14 11:01:18 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-14 18:01:47 +0000
commit93fd8d356920e768fb1914c99238c1d5ae62e3db (patch)
tree82a83f9a53b15f12aaab412d6cb9a3ad365eace0
parentfb10cce5ca304e0ed40290c7dd2deaf303a7aecd (diff)
downloadchromium_src-93fd8d356920e768fb1914c99238c1d5ae62e3db.zip
chromium_src-93fd8d356920e768fb1914c99238c1d5ae62e3db.tar.gz
chromium_src-93fd8d356920e768fb1914c99238c1d5ae62e3db.tar.bz2
Mac: Fix incorrect window background when cancelling tab drop using ESC key.
When cancelling tab drop using ESC key, we need to make the dragged window the main window so that its window background paints as active. BUG=421375 Review URL: https://codereview.chromium.org/652053002 Cr-Commit-Position: refs/heads/master@{#299508}
-rw-r--r--chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm
index 841c46c..572445d 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm
@@ -128,6 +128,7 @@ static BOOL PointIsInsideView(NSPoint screenPoint, NSView* view) {
tabWasDragged_ = NO;
} else {
[targetController_ removePlaceholder];
+ [[sourceController_ window] makeMainWindow];
if ([sourceController_ numberOfTabs] < 2) {
// Revert to a single-tab window.
targetController_ = nil;