[Password Generation] Change links in the bubble to point to the loca…

…l manager

BUG=413846

Review URL: https://codereview.chromium.org/583883003

Cr-Commit-Position: refs/heads/master@{#296482}

chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_confirmation_view_controller.mm

@@ -41,7 +41,7 @@ - (void)onOKClicked:(id)sender {
 - (BOOL)textView:(NSTextView*)textView
    clickedOnLink:(id)link
          atIndex:(NSUInteger)charIndex {
-  model_->OnRemoteManageLinkClicked();
+  model_->OnManageLinkClicked();
   [delegate_ viewShouldDismiss];
   return YES;
 }

chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_confirmation_view_controller_unittest.mm

@@ -76,7 +76,7 @@ virtual void SetUp() OVERRIDE {
        ShouldOpenPasswordsAndDismissWhenLinkClicked) {
   [controller().confirmationText clickedOnLink:nil atIndex:0];
   EXPECT_TRUE([delegate() dismissed]);
-  EXPECT_TRUE(ui_controller()->navigated_to_account_central_management_page());
+  EXPECT_TRUE(ui_controller()->navigated_to_settings_page());
 }
 
 }  // namespace

chrome/browser/ui/passwords/manage_passwords_bubble_model.cc

@@ -167,16 +167,6 @@ void ManagePasswordsBubbleModel::OnManageLinkClicked() {
       ->NavigateToPasswordManagerSettingsPage();
 }
 
-// TODO(gcasto): Is it worth having a new dismissal reason to distinguish
-// the two management cases? User intention is pretty similar between the two,
-// but the context in which they are shown is pretty different since one is
-// from an explict action and the other isn't.
-void ManagePasswordsBubbleModel::OnRemoteManageLinkClicked() {
-  dismissal_reason_ = metrics_util::CLICKED_MANAGE;
-  ManagePasswordsUIController::FromWebContents(web_contents())
-      ->NavigateToAccountCentralManagementPage();
-}
-
 void ManagePasswordsBubbleModel::OnPasswordAction(
     const autofill::PasswordForm& password_form,
     PasswordAction action) {

chrome/browser/ui/passwords/manage_passwords_bubble_model.h

@@ -60,10 +60,6 @@ class ManagePasswordsBubbleModel : public content::WebContentsObserver {
   // Called by the view code when the manage link is clicked by the user.
   void OnManageLinkClicked();
 
-  // Called by the view code when the manage in Google link is clicked by the
-  // user.
-  void OnRemoteManageLinkClicked();
-
   // Called by the view code to delete or add a password form to the
   // PasswordStore.
   void OnPasswordAction(const autofill::PasswordForm& password_form,

chrome/browser/ui/passwords/manage_passwords_ui_controller.cc

@@ -167,18 +167,6 @@ void ManagePasswordsUIController::
 #endif
 }
 
-void ManagePasswordsUIController::NavigateToAccountCentralManagementPage() {
-  // TODO(gcasto): FindBowserWithWebContents() doesn't exist on Android.
-  // Need to determine how this should work there.
-#if !defined(OS_ANDROID)
-  Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
-  content::OpenURLParams params(
-      GURL(chrome::kAutoPasswordGenerationLearnMoreURL), content::Referrer(),
-      NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK, false);
-  browser->OpenURL(params);
-#endif
-}
-
 void ManagePasswordsUIController::SavePassword() {
   DCHECK(PasswordPendingUserDecision());
   SavePasswordInternal();

chrome/browser/ui/passwords/manage_passwords_ui_controller.h

@@ -77,11 +77,6 @@ class ManagePasswordsUIController
   // Open a new tab, pointing to the password manager settings page.
   virtual void NavigateToPasswordManagerSettingsPage();
 
-  // Open a new tab, pointing to the Google manage passwords website.
-  // TODO(gcasto): Change this to navigate to account central once passwords
-  // are visible there. Currently goes to the Chrome support page.
-  virtual void NavigateToAccountCentralManagementPage();
-
   virtual const autofill::PasswordForm& PendingCredentials() const;
 
   // Set the state of the Omnibox icon, and possibly show the associated bubble

chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.cc

@@ -10,7 +10,6 @@ ManagePasswordsUIControllerMock::ManagePasswordsUIControllerMock(
     content::WebContents* contents)
     : ManagePasswordsUIController(contents),
       navigated_to_settings_page_(false),
-      navigated_to_account_central_management_page_(false),
       saved_password_(false),
       never_saved_password_(false) {
   contents->SetUserData(UserDataKey(), this);
@@ -24,10 +23,6 @@ void ManagePasswordsUIControllerMock::
   navigated_to_settings_page_ = true;
 }
 
-void ManagePasswordsUIControllerMock::NavigateToAccountCentralManagementPage() {
-  navigated_to_account_central_management_page_ = true;
-}
-
 const autofill::PasswordForm&
     ManagePasswordsUIControllerMock::PendingCredentials() const {
   return pending_credentials_;

chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h

@@ -33,11 +33,6 @@ class ManagePasswordsUIControllerMock
     return navigated_to_settings_page_;
   }
 
-  virtual void NavigateToAccountCentralManagementPage() OVERRIDE;
-  bool navigated_to_account_central_management_page() const {
-    return navigated_to_account_central_management_page_;
-  }
-
   // We don't have a FormManager in tests, so stub these out.
   virtual void SavePasswordInternal() OVERRIDE;
   bool saved_password() const { return saved_password_; }
@@ -63,7 +58,6 @@ class ManagePasswordsUIControllerMock
 
  private:
   bool navigated_to_settings_page_;
-  bool navigated_to_account_central_management_page_;
   bool saved_password_;
   bool never_saved_password_;
 

chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc

@@ -627,7 +627,7 @@ ManagePasswordsBubbleView::SaveConfirmationView::~SaveConfirmationView() {
 void ManagePasswordsBubbleView::SaveConfirmationView::StyledLabelLinkClicked(
     const gfx::Range& range, int event_flags) {
   DCHECK_EQ(range, parent_->model()->save_confirmation_link_range());
-  parent_->model()->OnRemoteManageLinkClicked();
+  parent_->model()->OnManageLinkClicked();
   parent_->Close();
 }