AutoFill: Aggregate profile data. Remove the AutoFill InfoBar.

chrome/browser/autofill/autofill_infobar_delegate.cc

Index: chrome/browser/autofill/autofill_infobar_delegate.cc
diff --git a/chrome/browser/autofill/autofill_infobar_delegate.cc b/chrome/browser/autofill/autofill_infobar_delegate.cc
deleted file mode 100644
index d0465dc87ac3992fc5c3f56658acd9ae3e6234e6..0000000000000000000000000000000000000000
--- a/chrome/browser/autofill/autofill_infobar_delegate.cc
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) 2010 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/autofill/autofill_infobar_delegate.h"
-
-#include "app/l10n_util.h"
-#include "app/resource_bundle.h"
-#include "chrome/browser/autofill/autofill_manager.h"
-#include "chrome/browser/browser.h"
-#include "chrome/browser/pref_service.h"
-#include "chrome/browser/profile.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/tab_contents/tab_contents_delegate.h"
-#include "chrome/common/pref_names.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-
-AutoFillInfoBarDelegate::AutoFillInfoBarDelegate(TabContents* tab_contents,
-                                                 AutoFillManager* host)
-    : ConfirmInfoBarDelegate(tab_contents),
-      browser_(NULL),
-      host_(host) {
-  if (tab_contents) {
-    // This is NULL for TestTabContents.
-    if (tab_contents->delegate())
-      browser_ = tab_contents->delegate()->GetBrowser();
-
-    PrefService* prefs = tab_contents->profile()->GetPrefs();
-    prefs->SetBoolean(prefs::kAutoFillInfoBarShown, true);
-    tab_contents->AddInfoBar(this);
-  }
-}
-
-AutoFillInfoBarDelegate::~AutoFillInfoBarDelegate() {
-}
-
-bool AutoFillInfoBarDelegate::ShouldExpire(
-    const NavigationController::LoadCommittedDetails& details) const {
-  // The user has submitted a form, causing the page to navigate elsewhere.  We
-  // don't want the infobar to be expired at this point, because the user won't
-  // get a chance to answer the question.
-  return false;
-}
-
-void AutoFillInfoBarDelegate::InfoBarClosed() {
-  if (host_) {
-    host_->OnInfoBarClosed();
-    host_ = NULL;
-  }
-
-  // This will delete us.
-  ConfirmInfoBarDelegate::InfoBarClosed();
-}
-
-std::wstring AutoFillInfoBarDelegate::GetMessageText() const {
-  return l10n_util::GetString(IDS_AUTOFILL_INFOBAR_TEXT);
-}
-
-SkBitmap* AutoFillInfoBarDelegate::GetIcon() const {
-  return ResourceBundle::GetSharedInstance().GetBitmapNamed(
-      IDR_INFOBAR_AUTOFILL);
-}
-
-int AutoFillInfoBarDelegate::GetButtons() const {
-  return BUTTON_OK | BUTTON_CANCEL;
-}
-
-std::wstring AutoFillInfoBarDelegate::GetButtonLabel(
-    ConfirmInfoBarDelegate::InfoBarButton button) const {
-  if (button == BUTTON_OK)
-    return l10n_util::GetString(IDS_AUTOFILL_INFOBAR_ACCEPT);
-  else if (button == BUTTON_CANCEL)
-    return l10n_util::GetString(IDS_AUTOFILL_INFOBAR_DENY);
-  else
-    NOTREACHED();
-
-  return std::wstring();
-}
-
-bool AutoFillInfoBarDelegate::Accept() {
-  if (host_) {
-    host_->OnInfoBarAccepted();
-    host_ = NULL;
-  }
-  return true;
-}
-
-bool AutoFillInfoBarDelegate::Cancel() {
-  if (host_) {
-    host_->OnInfoBarCancelled();
-    host_ = NULL;
-  }
-  return true;
-}
-
-std::wstring AutoFillInfoBarDelegate::GetLinkText() {
-  return l10n_util::GetString(IDS_AUTOFILL_LEARN_MORE);
-}
-
-bool AutoFillInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
-  browser_->OpenURL(GURL(kAutoFillLearnMoreUrl), GURL(), NEW_FOREGROUND_TAB,
-                    PageTransition::TYPED);
-  return true;
-}