diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 17:11:58 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 17:11:58 +0000 |
| commit | 4e763f977ee90c25d351a271cf8f401a957c8cc1 (patch) | |
| tree | 4ab57a0a9623367ca4438492770b438ede06c001 /chrome/browser/views/constrained_window_win.cc | |
| parent | 5f96bf3a7f495fe21e6a61b023a4a3659b3ec7e3 (diff) | |
| download | chromium_src-4e763f977ee90c25d351a271cf8f401a957c8cc1.zip chromium_src-4e763f977ee90c25d351a271cf8f401a957c8cc1.tar.gz chromium_src-4e763f977ee90c25d351a271cf8f401a957c8cc1.tar.bz2 | |
Fixes bug where showing an auth dialog during instant would trigger
the page to be prematurely committed.
BUG=56462
TEST=see bug
Review URL: http://codereview.chromium.org/3461020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60481 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/constrained_window_win.cc')
| -rw-r--r-- | chrome/browser/views/constrained_window_win.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/views/constrained_window_win.cc b/chrome/browser/views/constrained_window_win.cc index 4230606..f997c3d 100644 --- a/chrome/browser/views/constrained_window_win.cc +++ b/chrome/browser/views/constrained_window_win.cc @@ -563,16 +563,20 @@ views::NonClientFrameView* ConstrainedWindowWin::CreateFrameViewForWindow() { } void ConstrainedWindowWin::FocusConstrainedWindow() { - if (GetDelegate() && GetDelegate()->GetInitiallyFocusedView()) + if ((!owner_->delegate() || + owner_->delegate()->ShouldFocusConstrainedWindow(owner_)) && + GetDelegate() && GetDelegate()->GetInitiallyFocusedView()) { GetDelegate()->GetInitiallyFocusedView()->RequestFocus(); + } } void ConstrainedWindowWin::ShowConstrainedWindow() { + if (owner_->delegate()) + owner_->delegate()->WillShowConstrainedWindow(owner_); ActivateConstrainedWindow(); FocusConstrainedWindow(); } - void ConstrainedWindowWin::CloseConstrainedWindow() { // Broadcast to all observers of NOTIFY_CWINDOW_CLOSED. // One example of such an observer is AutomationCWindowTracker in the |