diff options
Diffstat (limited to 'chrome/browser/views/password_manager_view.cc')
-rw-r--r-- | chrome/browser/views/password_manager_view.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/chrome/browser/views/password_manager_view.cc b/chrome/browser/views/password_manager_view.cc index cf5eb50..86c6434 100644 --- a/chrome/browser/views/password_manager_view.cc +++ b/chrome/browser/views/password_manager_view.cc @@ -185,15 +185,12 @@ void PasswordManagerView::Show(Profile* profile) { instance_ = new PasswordManagerView(profile); // manager is owned by the dialog window, so Close() will delete it. - instance_->dialog_ = ChromeViews::Window::CreateChromeWindow(NULL, - gfx::Rect(), - instance_, - instance_); + ChromeViews::Window::CreateChromeWindow(NULL, gfx::Rect(), instance_); } - if (!instance_->dialog_->IsVisible()) { - instance_->dialog_->Show(); + if (!instance_->window()->IsVisible()) { + instance_->window()->Show(); } else { - instance_->dialog_->Activate(); + instance_->window()->Activate(); } } @@ -358,7 +355,7 @@ std::wstring PasswordManagerView::GetWindowTitle() const { } void PasswordManagerView::ButtonPressed(ChromeViews::NativeButton* sender) { - DCHECK(dialog_); + DCHECK(window()); // Close will result in our destruction. if (sender == &remove_all_button_) { table_model_.ForgetAndRemoveAllSignons(); @@ -397,3 +394,7 @@ void PasswordManagerView::WindowClosing() { // instance is created. instance_ = NULL; } + +ChromeViews::View* PasswordManagerView::GetContentsView() { + return this; +} |