summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/browser_window_cocoa.mm
diff options
context:
space:
mode:
authorrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 17:38:32 +0000
committerrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 17:38:32 +0000
commit5845cffa85aabe4a05d6b3e41a769d60fd6658fa (patch)
treec91d06ec7b47b8f7875126f3edbd558ee262f63c /chrome/browser/cocoa/browser_window_cocoa.mm
parent5306d118a2880703b2e7d24d1267f7c3e67b376b (diff)
downloadchromium_src-5845cffa85aabe4a05d6b3e41a769d60fd6658fa.zip
chromium_src-5845cffa85aabe4a05d6b3e41a769d60fd6658fa.tar.gz
chromium_src-5845cffa85aabe4a05d6b3e41a769d60fd6658fa.tar.bz2
[Mac] Bring the correct window to the front when calling BrowserWindow::Activate(). Before this would ignore the existence of fullscreen windows.
BUG=http://crbug.com/21145 TEST=Trigger a javascript alert dialog. The original non-fullscreen window should not appear. Review URL: http://codereview.chromium.org/274060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29137 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/browser_window_cocoa.mm')
-rw-r--r--chrome/browser/cocoa/browser_window_cocoa.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm
index 66711aa..38b001e 100644
--- a/chrome/browser/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/cocoa/browser_window_cocoa.mm
@@ -71,7 +71,7 @@ void BrowserWindowCocoa::Close() {
}
void BrowserWindowCocoa::Activate() {
- [window_ makeKeyAndOrderFront:controller_];
+ [controller_ activate];
}
void BrowserWindowCocoa::FlashFrame() {