| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/login/login_prompt.h" | 5 #include "chrome/browser/ui/login/login_prompt.h" |
| 6 | 6 |
| 7 #include "base/string16.h" | 7 #include "base/string16.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "chrome/browser/password_manager/password_manager.h" | 9 #include "chrome/browser/password_manager/password_manager.h" |
| 10 #include "chrome/browser/tab_contents/tab_util.h" | 10 #include "chrome/browser/tab_contents/tab_util.h" |
| 11 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 11 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
| 12 #include "chrome/browser/ui/views/constrained_window_views.h" | 12 #include "chrome/browser/ui/views/constrained_window_views.h" |
| 13 #include "chrome/browser/ui/views/login_view.h" | 13 #include "chrome/browser/ui/views/login_view.h" |
| 14 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
| 15 #include "content/public/browser/render_view_host.h" | 15 #include "content/public/browser/render_view_host.h" |
| 16 #include "content/public/browser/web_contents.h" | 16 #include "content/public/browser/web_contents.h" |
| 17 #include "grit/generated_resources.h" | 17 #include "grit/generated_resources.h" |
| 18 #include "net/url_request/url_request.h" | 18 #include "net/url_request/url_request.h" |
| 19 #include "ui/base/l10n/l10n_util.h" | 19 #include "ui/base/l10n/l10n_util.h" |
| 20 #include "ui/views/window/dialog_delegate.h" | 20 #include "ui/views/window/dialog_delegate.h" |
| 21 | 21 |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 // disassociating the model from the view, because the view will | 120 // disassociating the model from the view, because the view will |
| 121 // be deleted before the password manager. | 121 // be deleted before the password manager. |
| 122 login_view_ = new LoginView(explanation, manager); | 122 login_view_ = new LoginView(explanation, manager); |
| 123 | 123 |
| 124 // Scary thread safety note: This can potentially be called *after* SetAuth | 124 // Scary thread safety note: This can potentially be called *after* SetAuth |
| 125 // or CancelAuth (say, if the request was cancelled before the UI thread got | 125 // or CancelAuth (say, if the request was cancelled before the UI thread got |
| 126 // control). However, that's OK since any UI interaction in those functions | 126 // control). However, that's OK since any UI interaction in those functions |
| 127 // will occur via an InvokeLater on the UI thread, which is guaranteed | 127 // will occur via an InvokeLater on the UI thread, which is guaranteed |
| 128 // to happen after this is called (since this was InvokeLater'd first). | 128 // to happen after this is called (since this was InvokeLater'd first). |
| 129 WebContents* requesting_contents = GetWebContentsForLogin(); | 129 WebContents* requesting_contents = GetWebContentsForLogin(); |
| 130 TabContentsWrapper* wrapper = | 130 TabContents* tab_contents = |
| 131 TabContentsWrapper::GetCurrentWrapperForContents(requesting_contents); | 131 TabContents::FromWebContents(requesting_contents); |
| 132 SetDialog(new ConstrainedWindowViews(wrapper, this)); | 132 SetDialog(new ConstrainedWindowViews(tab_contents, this)); |
| 133 NotifyAuthNeeded(); | 133 NotifyAuthNeeded(); |
| 134 } | 134 } |
| 135 | 135 |
| 136 private: | 136 private: |
| 137 friend class base::RefCountedThreadSafe<LoginHandlerViews>; | 137 friend class base::RefCountedThreadSafe<LoginHandlerViews>; |
| 138 friend class LoginPrompt; | 138 friend class LoginPrompt; |
| 139 | 139 |
| 140 ~LoginHandlerViews() {} | 140 ~LoginHandlerViews() {} |
| 141 | 141 |
| 142 // The LoginView that contains the user's login information | 142 // The LoginView that contains the user's login information |
| 143 LoginView* login_view_; | 143 LoginView* login_view_; |
| 144 | 144 |
| 145 DISALLOW_COPY_AND_ASSIGN(LoginHandlerViews); | 145 DISALLOW_COPY_AND_ASSIGN(LoginHandlerViews); |
| 146 }; | 146 }; |
| 147 | 147 |
| 148 // static | 148 // static |
| 149 LoginHandler* LoginHandler::Create(net::AuthChallengeInfo* auth_info, | 149 LoginHandler* LoginHandler::Create(net::AuthChallengeInfo* auth_info, |
| 150 net::URLRequest* request) { | 150 net::URLRequest* request) { |
| 151 return new LoginHandlerViews(auth_info, request); | 151 return new LoginHandlerViews(auth_info, request); |
| 152 } | 152 } |
| OLD | NEW |