Create an interface between ChromePasswordManagerClient and ManagePasswordsUIController

chrome/browser/ui/passwords/manage_passwords_ui_controller.cc

 // Copyright 2014 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/ui/passwords/manage_passwords_ui_controller.h"
 
 #include "base/auto_reset.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
@@ skipping 53 matching lines @@
   passwords_data_.set_client(
       ChromePasswordManagerClient::FromWebContents(web_contents));
   password_manager::PasswordStore* password_store =
       GetPasswordStore(web_contents);
   if (password_store)
     password_store->AddObserver(this);
 }
 
 ManagePasswordsUIController::~ManagePasswordsUIController() {}
 
-void ManagePasswordsUIController::UpdateBubbleAndIconVisibility() {
-  // If we're not on a "webby" URL (e.g. "chrome://sign-in"), we shouldn't
-  // display either the bubble or the icon.
-  if (!BrowsingDataHelper::IsWebScheme(
-          web_contents()->GetLastCommittedURL().scheme())) {
-    passwords_data_.OnInactive();
-  }
-
-#if !defined(OS_ANDROID)
-  Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
-  if (!browser)
-    return;
-  LocationBar* location_bar = browser->window()->GetLocationBar();
-  DCHECK(location_bar);
-  location_bar->UpdateManagePasswordsIconAndBubble();
-#endif
-}
-
-void ManagePasswordsUIController::
-    UpdateAndroidAccountChooserInfoBarVisibility() {
-#if defined(OS_ANDROID)
-  // Deletes itself on the event from Java counterpart, when user interacts with
-  // dialog.
-  AccountChooserDialogAndroid* acccount_chooser_dialog =
-      new AccountChooserDialogAndroid(web_contents(), this);
-  acccount_chooser_dialog->ShowDialog();
-  should_pop_up_bubble_ = false;
-#endif
-}
-
-base::TimeDelta ManagePasswordsUIController::Elapsed() const {
-  return timer_ ? timer_->Elapsed() : base::TimeDelta::Max();
-}
-
 void ManagePasswordsUIController::OnPasswordSubmitted(
     scoped_ptr<PasswordFormManager> form_manager) {
   bool show_bubble = !form_manager->IsBlacklisted();
   passwords_data_.OnPendingPassword(form_manager.Pass());
   if (show_bubble) {
     password_manager::InteractionsStats* stats = GetCurrentInteractionStats();
     if (stats && stats->dismissal_count > kMaxShowSaveBubble)
       show_bubble = false;
   }
   timer_.reset(new base::ElapsedTimer);
@@ skipping 65 matching lines @@
 }
 
 void ManagePasswordsUIController::OnLoginsChanged(
     const password_manager::PasswordStoreChangeList& changes) {
   password_manager::ui::State current_state = GetState();
   passwords_data_.ProcessLoginsChanged(changes);
   if (current_state != GetState())
     UpdateBubbleAndIconVisibility();
 }
 
+#if !defined(OS_ANDROID)
+void ManagePasswordsUIController::UpdateIconAndBubbleState(
+    ManagePasswordsIconView* icon) {
+  if (should_pop_up_bubble_) {
+    // We must display the icon before showing the bubble, as the bubble would
+    // be otherwise unanchored.
+    icon->SetState(GetState());
+    ShowBubbleWithoutUserInteraction();
+  } else {
+    icon->SetState(GetState());
+  }
+}
+#endif
+
 const GURL& ManagePasswordsUIController::GetOrigin() const {
   return passwords_data_.origin();
 }
 
 password_manager::ui::State ManagePasswordsUIController::GetState() const {
   return passwords_data_.state();
 }
 
 const autofill::PasswordForm& ManagePasswordsUIController::
     GetPendingPassword() const {
@@ skipping 162 matching lines @@
   form_manager->Update(password_form);
 }
 
 void ManagePasswordsUIController::NeverSavePasswordInternal() {
   password_manager::PasswordFormManager* form_manager =
       passwords_data_.form_manager();
   DCHECK(form_manager);
   form_manager->PermanentlyBlacklist();
 }
 
+void ManagePasswordsUIController::UpdateBubbleAndIconVisibility() {
+  // If we're not on a "webby" URL (e.g. "chrome://sign-in"), we shouldn't
+  // display either the bubble or the icon.
+  if (!BrowsingDataHelper::IsWebScheme(
+          web_contents()->GetLastCommittedURL().scheme())) {
+    passwords_data_.OnInactive();
+  }
+
+#if !defined(OS_ANDROID)
+  Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
+  if (!browser)
+    return;
+  LocationBar* location_bar = browser->window()->GetLocationBar();
+  DCHECK(location_bar);
+  location_bar->UpdateManagePasswordsIconAndBubble();
+#endif
+}
+
+base::TimeDelta ManagePasswordsUIController::Elapsed() const {
+  return timer_ ? timer_->Elapsed() : base::TimeDelta::Max();
+}
+
 void ManagePasswordsUIController::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   // Don't react to in-page (fragment) navigations.
   if (details.is_in_page)
     return;
 
   // Don't do anything if a navigation occurs before a user could reasonably
   // interact with the password bubble.
   if (Elapsed() < base::TimeDelta::FromSeconds(kBubbleMinTime))
     return;
 
   // Otherwise, reset the password manager and the timer.
   passwords_data_.OnInactive();
   UpdateBubbleAndIconVisibility();
   // This allows the bubble to survive several redirects in case the whole
   // process of navigating to the landing page is longer than 1 second.
   timer_.reset(new base::ElapsedTimer());
 }
 
 void ManagePasswordsUIController::WasHidden() {
 #if !defined(OS_ANDROID)
   TabDialogs::FromWebContents(web_contents())->HideManagePasswordsBubble();
 #endif
 }
 
-#if !defined(OS_ANDROID)
-void ManagePasswordsUIController::UpdateIconAndBubbleState(
-    ManagePasswordsIconView* icon) {
-  if (should_pop_up_bubble_) {
-    // We must display the icon before showing the bubble, as the bubble would
-    // be otherwise unanchored.
-    icon->SetState(GetState());
-    ShowBubbleWithoutUserInteraction();
-  } else {
-    icon->SetState(GetState());
-  }
-}
-#endif
-
 void ManagePasswordsUIController::ShowBubbleWithoutUserInteraction() {
   DCHECK(should_pop_up_bubble_);
 #if !defined(OS_ANDROID)
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
   if (!browser || browser->toolbar_model()->input_in_progress())
     return;
 
   CommandUpdater* updater = browser->command_controller()->command_updater();
   updater->ExecuteCommand(IDC_MANAGE_PASSWORDS_FOR_PAGE);
 #endif
 }
 
 void ManagePasswordsUIController::WebContentsDestroyed() {
   password_manager::PasswordStore* password_store =
       GetPasswordStore(web_contents());
   if (password_store)
     password_store->RemoveObserver(this);
 }
+
+void ManagePasswordsUIController::
+    UpdateAndroidAccountChooserInfoBarVisibility() {
+#if defined(OS_ANDROID)
+  // Deletes itself on the event from Java counterpart, when user interacts with
+  // dialog.
+  AccountChooserDialogAndroid* acccount_chooser_dialog =
+      new AccountChooserDialogAndroid(web_contents(), this);
+  acccount_chooser_dialog->ShowDialog();
+  should_pop_up_bubble_ = false;
+#endif
+}