Refactoring Manage Passwords Bubble Code to exclude TabSpecificContentSettings

chrome/browser/content_settings/tab_specific_content_settings.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 
 #include <list>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 16 matching lines @@
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "net/cookies/canonical_cookie.h"
 #include "webkit/common/fileapi/file_system_types.h"
 
-using autofill::PasswordFormMap;
 using content::BrowserThread;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::RenderViewHost;
 using content::WebContents;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(TabSpecificContentSettings);
 
-TabSpecificContentSettings::PasswordObserver::PasswordObserver(
-    TabSpecificContentSettings* tab_specific_content_settings)
-    : tab_specific_content_settings_(tab_specific_content_settings) {
-  tab_specific_content_settings_->SetPasswordObserver(this);
-}
-
-TabSpecificContentSettings::PasswordObserver::~PasswordObserver() {
-  if (tab_specific_content_settings_)
-    tab_specific_content_settings_->SetPasswordObserver(NULL);
-}
-
-void TabSpecificContentSettings::PasswordObserver::ContentSettingsDestroyed() {
-  tab_specific_content_settings_ = NULL;
-}
-
 TabSpecificContentSettings::SiteDataObserver::SiteDataObserver(
     TabSpecificContentSettings* tab_specific_content_settings)
     : tab_specific_content_settings_(tab_specific_content_settings) {
   tab_specific_content_settings_->AddSiteDataObserver(this);
 }
 
 TabSpecificContentSettings::SiteDataObserver::~SiteDataObserver() {
   if (tab_specific_content_settings_)
     tab_specific_content_settings_->RemoveSiteDataObserver(this);
 }
 
 void TabSpecificContentSettings::SiteDataObserver::ContentSettingsDestroyed() {
   tab_specific_content_settings_ = NULL;
 }
 
 TabSpecificContentSettings::TabSpecificContentSettings(WebContents* tab)
     : content::WebContentsObserver(tab),
-      password_observer_(NULL),
       profile_(Profile::FromBrowserContext(tab->GetBrowserContext())),
       allowed_local_shared_objects_(profile_),
       blocked_local_shared_objects_(profile_),
       geolocation_usages_state_(profile_, CONTENT_SETTINGS_TYPE_GEOLOCATION),
       midi_usages_state_(profile_, CONTENT_SETTINGS_TYPE_MIDI_SYSEX),
       pending_protocol_handler_(ProtocolHandler::EmptyProtocolHandler()),
       previous_protocol_handler_(ProtocolHandler::EmptyProtocolHandler()),
       pending_protocol_handler_setting_(CONTENT_SETTING_DEFAULT),
-      load_plugins_link_enabled_(true),
-      manage_passwords_icon_to_be_shown_(false),
-      password_to_be_saved_(false),
-      manage_passwords_bubble_needs_showing_(false),
-      password_submitted_(false) {
+      load_plugins_link_enabled_(true) {
   ClearBlockedContentSettingsExceptForCookies();
   ClearCookieSpecificContentSettings();
 
   registrar_.Add(this, chrome::NOTIFICATION_CONTENT_SETTINGS_CHANGED,
                  content::Source<HostContentSettingsMap>(
                      profile_->GetHostContentSettingsMap()));
 }
 
 TabSpecificContentSettings::~TabSpecificContentSettings() {
   FOR_EACH_OBSERVER(
       SiteDataObserver, observer_list_, ContentSettingsDestroyed());
-  if (password_observer_)
-    password_observer_->ContentSettingsDestroyed();
 }
 
 TabSpecificContentSettings* TabSpecificContentSettings::Get(
     int render_process_id, int render_view_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   RenderViewHost* view = RenderViewHost::FromID(render_process_id,
                                                 render_view_id);
   if (!view)
     return NULL;
@@ skipping 372 matching lines @@
     bool allowed) {
   if (allowed) {
     OnContentAllowed(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER);
   } else {
     OnContentBlocked(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
                      std::string());
   }
 }
 #endif
 
-void TabSpecificContentSettings::OnPasswordSubmitted(
-    PasswordFormManager* form_manager) {
-  form_manager_.reset(form_manager);
-  password_form_map_ = form_manager_->best_matches();
-  manage_passwords_icon_to_be_shown_ = true;
-  password_to_be_saved_ = true;
-  manage_passwords_bubble_needs_showing_ = true;
-  password_submitted_ = true;
-  NotifyPasswordObserver();
-}
-
-void TabSpecificContentSettings::OnPasswordAutofilled(
-    const PasswordFormMap& password_form_map) {
-  password_form_map_ = password_form_map;
-  manage_passwords_icon_to_be_shown_ = true;
-  password_to_be_saved_ = false;
-  manage_passwords_bubble_needs_showing_ = false;
-  password_submitted_ = false;
-  NotifyPasswordObserver();
-}
-
 TabSpecificContentSettings::MicrophoneCameraState
 TabSpecificContentSettings::GetMicrophoneCameraState() const {
   if (IsContentAllowed(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) &&
       IsContentAllowed(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)) {
     return MICROPHONE_CAMERA_ACCESSED;
   } else if (IsContentAllowed(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC)) {
     return MICROPHONE_ACCESSED;
   } else if (IsContentAllowed(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)) {
     return CAMERA_ACCESSED;
   }
@@ skipping 163 matching lines @@
 }
 
 void TabSpecificContentSettings::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   if (!details.is_in_page) {
     // Clear "blocked" flags.
     ClearBlockedContentSettingsExceptForCookies();
     GeolocationDidNavigate(details);
     MIDIDidNavigate(details);
-    // Reset password states for next page.
-    manage_passwords_icon_to_be_shown_ = false;
-    password_to_be_saved_ = false;
-    manage_passwords_bubble_needs_showing_ = false;
-    NotifySiteDataObservers();
-    NotifyPasswordObserver();
   }
 }
 
 void TabSpecificContentSettings::DidStartProvisionalLoadForFrame(
     int64 frame_id,
     int64 parent_frame_id,
     bool is_main_frame,
     const GURL& validated_url,
     bool is_error_page,
     bool is_iframe_srcdoc,
@@ skipping 15 matching lines @@
                                                   bool blocked_by_policy) {
   if (blocked_by_policy) {
     blocked_local_shared_objects_.appcaches()->AddAppCache(manifest_url);
     OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES, std::string());
   } else {
     allowed_local_shared_objects_.appcaches()->AddAppCache(manifest_url);
     OnContentAllowed(CONTENT_SETTINGS_TYPE_COOKIES);
   }
 }
 
-void TabSpecificContentSettings::SavePassword() {
-  DCHECK(form_manager_.get());
-  form_manager_->Save();
-}
-
 void TabSpecificContentSettings::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_CONTENT_SETTINGS_CHANGED);
 
   content::Details<const ContentSettingsDetails> settings_details(details);
   const NavigationController& controller = web_contents()->GetController();
   NavigationEntry* entry = controller.GetVisibleEntry();
   GURL entry_url;
   if (entry)
     entry_url = entry->GetURL();
   if (settings_details.ptr()->update_all() ||
       // The visible NavigationEntry is the URL in the URL field of a tab.
       // Currently this should be matched by the |primary_pattern|.
       settings_details.ptr()->primary_pattern().Matches(entry_url)) {
     Profile* profile =
         Profile::FromBrowserContext(web_contents()->GetBrowserContext());
     RendererContentSettingRules rules;
     GetRendererContentSettingRules(profile->GetHostContentSettingsMap(),
                                    &rules);
     Send(new ChromeViewMsg_SetContentSettingRules(rules));
   }
 }
 
-void TabSpecificContentSettings::SetPasswordObserver(
-    PasswordObserver* observer) {
-  password_observer_ = observer;
-}
-
-void TabSpecificContentSettings::NotifyPasswordObserver() {
-  if (password_observer_)
-    password_observer_->OnPasswordAction();
-}
-
 void TabSpecificContentSettings::AddSiteDataObserver(
     SiteDataObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void TabSpecificContentSettings::RemoveSiteDataObserver(
     SiteDataObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 void TabSpecificContentSettings::NotifySiteDataObservers() {
   FOR_EACH_OBSERVER(SiteDataObserver, observer_list_, OnSiteDataAccessed());
 }