summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/options
diff options
context:
space:
mode:
authordhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-05 01:15:15 +0000
committerdhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-05 01:15:15 +0000
commitf5fb4d4bc5bc2477eb3d7aadd13bd5c487b79559 (patch)
tree2d86029eeac9e0b4302c3479a1cd07cfce4b15f2 /chrome/browser/gtk/options
parent87e6564011c57a6760dd6a2f90afc419b37967ae (diff)
downloadchromium_src-f5fb4d4bc5bc2477eb3d7aadd13bd5c487b79559.zip
chromium_src-f5fb4d4bc5bc2477eb3d7aadd13bd5c487b79559.tar.gz
chromium_src-f5fb4d4bc5bc2477eb3d7aadd13bd5c487b79559.tar.bz2
Revert 46424 - AutoFill profile shouldn't be saved when cancelled during initial setup.
For first encounter with fillable form, the AutoFillManager::OnInfoBarAccepted() call now passes the new profile and credit card information to the dialog directly instead of saving it to the database and then invoking the dialog. This facilitates "Cancel" in the dialog where the new information is not persisted. This was a good opportunity to refactor the deferred PersonalDataManager::Observer() logic out of the preferences dialog and into the AutoFillDialogController itself. This also consolidates the Windows, Mac, and Linux interfaces for the ShowAutoFillDialog() call. More work is required on Linux and Windows to properly conform to this interface and fix bug 41010. The Linux and Windows implementations will need to respect the new input parameters |imported_profile| and |imported_credit_card|. BUG=41010 TEST=AutoFillDialogControllerTest.WaitForDataToLoad, AutoFillDialogControllerTest.ImportedParameters Review URL: http://codereview.chromium.org/1930002 TBR=dhollowa@chromium.org Review URL: http://codereview.chromium.org/1902003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46426 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/options')
-rw-r--r--chrome/browser/gtk/options/content_page_gtk.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc
index 770476d..3b92201 100644
--- a/chrome/browser/gtk/options/content_page_gtk.cc
+++ b/chrome/browser/gtk/options/content_page_gtk.cc
@@ -215,7 +215,7 @@ void ContentPageGtk::OnPersonalDataLoaded() {
// remove ourselves as observer.
personal_data_->RemoveObserver(this);
- ShowAutoFillDialog(NULL, personal_data_, profile(), NULL, NULL);
+ ShowAutoFillDialog(NULL, personal_data_, profile());
}
GtkWidget* ContentPageGtk::InitPasswordSavingGroup() {