diff options
| author | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
| commit | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch) | |
| tree | 7784b988ef1698cb6967ea1bdf07616237716c6c /chrome/browser/login_prompt_win.cc | |
| parent | efc8475837ec58186051f23bb03542620424f6ce (diff) | |
| download | external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.zip external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.gz external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.bz2 | |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
Diffstat (limited to 'chrome/browser/login_prompt_win.cc')
| -rw-r--r-- | chrome/browser/login_prompt_win.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/login_prompt_win.cc b/chrome/browser/login_prompt_win.cc index 39f1497..e82899d 100644 --- a/chrome/browser/login_prompt_win.cc +++ b/chrome/browser/login_prompt_win.cc @@ -12,6 +12,7 @@ #include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/views/login_view.h" #include "chrome/common/notification_service.h" @@ -104,7 +105,11 @@ class LoginHandlerWin : public LoginHandler, std::wstring explanation) { DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); - LoginView* view = new LoginView(explanation); + TabContents* tab_contents = GetTabContentsForLogin(); + bool should_focus_view = !tab_contents->delegate() || + tab_contents->delegate()->ShouldFocusConstrainedWindow(tab_contents); + + LoginView* view = new LoginView(explanation, should_focus_view); // Set the model for the login view. The model (password manager) is owned // by the view's parent TabContents, so natural destruction order means we |