diff options
author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 19:51:21 +0000 |
---|---|---|
committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 19:51:21 +0000 |
commit | 21674df8085ee01ca91bbd4fe41ee1ea240a0cda (patch) | |
tree | 39462aa48bef10131eb36c22b38e9566336438f2 /chrome/browser/autofill | |
parent | 8b160034c47761a7cefd93019d0c45b9f7911be7 (diff) | |
download | chromium_src-21674df8085ee01ca91bbd4fe41ee1ea240a0cda.zip chromium_src-21674df8085ee01ca91bbd4fe41ee1ea240a0cda.tar.gz chromium_src-21674df8085ee01ca91bbd4fe41ee1ea240a0cda.tar.bz2 |
Add initial implementation of AutoFill++. This implementation is hidden behind a switch, --enable-new-autofill. So far, we only pop up an infobar asking the user if he'd like to save the form information. I've added a rudimentary icon for the infobar, pulled from the mocks, so we'll probably want a blessed version of this icon at some point.
BUG=18201
TEST=none
Review URL: http://codereview.chromium.org/339030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autofill')
-rw-r--r-- | chrome/browser/autofill/autofill_infobar_delegate.cc | 76 | ||||
-rw-r--r-- | chrome/browser/autofill/autofill_infobar_delegate.h | 42 | ||||
-rw-r--r-- | chrome/browser/autofill/autofill_manager.cc | 41 | ||||
-rw-r--r-- | chrome/browser/autofill/autofill_manager.h | 48 |
4 files changed, 207 insertions, 0 deletions
diff --git a/chrome/browser/autofill/autofill_infobar_delegate.cc b/chrome/browser/autofill/autofill_infobar_delegate.cc new file mode 100644 index 0000000..9333b3a --- /dev/null +++ b/chrome/browser/autofill/autofill_infobar_delegate.cc @@ -0,0 +1,76 @@ +// Copyright (c) 2009 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/tab_contents/tab_contents.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), + host_(host) { + if (tab_contents) + 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() { + Cancel(); + // 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); + + return l10n_util::GetString(IDS_AUTOFILL_INFOBAR_DENY); +} + +bool AutoFillInfoBarDelegate::Accept() { + if (host_) { + host_->SaveFormData(); + host_ = NULL; + } + return true; +} + +bool AutoFillInfoBarDelegate::Cancel() { + if (host_) { + host_->Reset(); + host_ = NULL; + } + return true; +} diff --git a/chrome/browser/autofill/autofill_infobar_delegate.h b/chrome/browser/autofill/autofill_infobar_delegate.h new file mode 100644 index 0000000..1a6e267 --- /dev/null +++ b/chrome/browser/autofill/autofill_infobar_delegate.h @@ -0,0 +1,42 @@ +// Copyright (c) 2009 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. + +#ifndef CHROME_BROWSER_AUTOFILL_AUTOFILL_INFOBAR_DELEGATE_H_ +#define CHROME_BROWSER_AUTOFILL_AUTOFILL_INFOBAR_DELEGATE_H_ + +#include <string> + +#include "chrome/browser/tab_contents/infobar_delegate.h" + +class AutoFillManager; +class SkBitmap; +class TabContents; + +// An InfoBar delegate that enables the user to allow or deny storing personal +// information gathered from a form submission. +class AutoFillInfoBarDelegate : public ConfirmInfoBarDelegate { + public: + AutoFillInfoBarDelegate(TabContents* tab_contents, AutoFillManager* host); + virtual ~AutoFillInfoBarDelegate(); + + // ConfirmInfoBarDelegate implementation. + virtual bool ShouldExpire( + const NavigationController::LoadCommittedDetails& details) const; + virtual void InfoBarClosed(); + virtual std::wstring GetMessageText() const; + virtual SkBitmap* GetIcon() const; + virtual int GetButtons() const; + virtual std::wstring GetButtonLabel( + ConfirmInfoBarDelegate::InfoBarButton button) const; + virtual bool Accept(); + virtual bool Cancel(); + + private: + // The autofill manager that initiated this infobar. + AutoFillManager* host_; + + DISALLOW_COPY_AND_ASSIGN(AutoFillInfoBarDelegate); +}; + +#endif // CHROME_BROWSER_AUTOFILL_AUTOFILL_INFOBAR_DELEGATE_H_ diff --git a/chrome/browser/autofill/autofill_manager.cc b/chrome/browser/autofill/autofill_manager.cc new file mode 100644 index 0000000..6b78a3d --- /dev/null +++ b/chrome/browser/autofill/autofill_manager.cc @@ -0,0 +1,41 @@ +// Copyright (c) 2009 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_manager.h" + +#include "base/command_line.h" +#include "chrome/browser/autofill/autofill_infobar_delegate.h" +#include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/common/chrome_switches.h" +#include "webkit/glue/form_field_values.h" + +AutoFillManager::AutoFillManager(TabContents* tab_contents) + : tab_contents_(tab_contents), + infobar_(NULL) { +} + +AutoFillManager::~AutoFillManager() { +} + +void AutoFillManager::FormFieldValuesSubmitted( + const webkit_glue::FormFieldValues& form) { + // TODO(jhawkins): Remove this switch when AutoFill++ is fully implemented. + if (!CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableNewAutoFill)) + return; + + // Grab a copy of the form data. + form_data_.reset(new webkit_glue::FormFieldValues(form)); + + // Ask the user for permission to save form information. + infobar_.reset(new AutoFillInfoBarDelegate(tab_contents_, this)); +} + +void AutoFillManager::SaveFormData() { + // TODO(jhawkins): Save the form data to the web database. +} + +void AutoFillManager::Reset() { + form_data_.reset(); +} diff --git a/chrome/browser/autofill/autofill_manager.h b/chrome/browser/autofill/autofill_manager.h new file mode 100644 index 0000000..6e09e6f --- /dev/null +++ b/chrome/browser/autofill/autofill_manager.h @@ -0,0 +1,48 @@ +// Copyright (c) 2009 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. + +#ifndef CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_ +#define CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_ + +#include "base/scoped_ptr.h" +#include "chrome/browser/renderer_host/render_view_host_delegate.h" + +namespace webkit_glue { +class FormFieldValues; +} + +class AutoFillInfoBarDelegate; +class TabContents; + +// Manages saving and restoring the user's personal information entered into web +// forms. +class AutoFillManager : public RenderViewHostDelegate::AutoFill { + public: + explicit AutoFillManager(TabContents* tab_contents); + virtual ~AutoFillManager(); + + // RenderViewHostDelegate::AutoFill implementation. + virtual void FormFieldValuesSubmitted( + const webkit_glue::FormFieldValues& form); + + // Saves the form data to the web database. + void SaveFormData(); + + // Resets the stored form data. + void Reset(); + + private: + // The TabContents hosting this AutoFillManager. + TabContents* tab_contents_; + + // Our copy of the form data. + scoped_ptr<webkit_glue::FormFieldValues> form_data_; + + // The infobar asking for permission to store form information. + scoped_ptr<AutoFillInfoBarDelegate> infobar_; + + DISALLOW_COPY_AND_ASSIGN(AutoFillManager); +}; + +#endif // CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_ |