Index: chrome/browser/content_settings/tab_specific_content_settings.cc |
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc |
index 2b7550701d88ce0957004de8f3a042110b3da80d..ef49b78d18333c1b2b19471fe14764f9a62fafe5 100644 |
--- a/chrome/browser/content_settings/tab_specific_content_settings.cc |
+++ b/chrome/browser/content_settings/tab_specific_content_settings.cc |
@@ -20,7 +20,6 @@ |
#include "chrome/browser/content_settings/content_settings_details.h" |
#include "chrome/browser/content_settings/content_settings_utils.h" |
#include "chrome/browser/content_settings/host_content_settings_map.h" |
-#include "chrome/browser/password_manager/password_form_manager.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/common/chrome_switches.h" |
#include "chrome/common/render_messages.h" |
@@ -99,18 +98,6 @@ TabSpecificContentSettings::~TabSpecificContentSettings() { |
SiteDataObserver, observer_list_, ContentSettingsDestroyed()); |
} |
-bool TabSpecificContentSettings::PasswordAccepted() { |
- DCHECK(form_to_save_.get()); |
- form_to_save_->SavePassword(); |
- return true; |
-} |
- |
-bool TabSpecificContentSettings::PasswordFormBlacklisted() { |
- DCHECK(form_to_save_.get()); |
- form_to_save_->BlacklistPassword(); |
- return true; |
-} |
- |
TabSpecificContentSettings* TabSpecificContentSettings::Get( |
int render_process_id, int render_view_id) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
@@ -476,8 +463,8 @@ void TabSpecificContentSettings::OnGeolocationPermissionSet( |
} |
void TabSpecificContentSettings::OnPasswordSubmitted( |
- PasswordFormManager* form_to_save) { |
- form_to_save_.reset(form_to_save); |
+ PasswordFormManager* form_manager) { |
+ form_manager_.reset(form_manager); |
OnContentAllowed(CONTENT_SETTINGS_TYPE_SAVE_PASSWORD); |
NotifySiteDataObservers(); |
} |
@@ -659,8 +646,8 @@ bool TabSpecificContentSettings::OnMessageReceived( |
void TabSpecificContentSettings::DidNavigateMainFrame( |
const content::LoadCommittedDetails& details, |
const content::FrameNavigateParams& params) { |
- if (form_to_save_) |
- form_to_save_->ApplyChange(); |
+ if (form_manager_) |
+ form_manager_->ApplyChange(); |
if (!details.is_in_page) { |
// Clear "blocked" flags. |
ClearBlockedContentSettingsExceptForCookies(); |