diff options
author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-09 01:31:10 +0000 |
---|---|---|
committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-09 01:31:10 +0000 |
commit | f10d9e175f026c82990a7c9ce4a11cb079bae770 (patch) | |
tree | 29ce2340334714863d75d325d8aba8e1f0f5bff7 /chrome/browser/autofill | |
parent | b21f0e2f1281c71a0362c62b2431696c1e51a8a2 (diff) | |
download | chromium_src-f10d9e175f026c82990a7c9ce4a11cb079bae770.zip chromium_src-f10d9e175f026c82990a7c9ce4a11cb079bae770.tar.gz chromium_src-f10d9e175f026c82990a7c9ce4a11cb079bae770.tar.bz2 |
Autofill help link should link to locale specific site
Changes Autofill help link to be .grd based for all platforms. Also, unified the handling of activating the link.
BUG=57092
TEST=Manual tests from prefs dialog and credit card infobar.
Review URL: http://codereview.chromium.org/3645002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62058 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autofill')
-rw-r--r-- | chrome/browser/autofill/autofill_cc_infobar_delegate.cc | 6 | ||||
-rw-r--r-- | chrome/browser/autofill/autofill_dialog_gtk.cc | 5 | ||||
-rw-r--r-- | chrome/browser/autofill/autofill_manager.cc | 4 | ||||
-rw-r--r-- | chrome/browser/autofill/autofill_manager.h | 3 |
4 files changed, 7 insertions, 11 deletions
diff --git a/chrome/browser/autofill/autofill_cc_infobar_delegate.cc b/chrome/browser/autofill/autofill_cc_infobar_delegate.cc index 2dadc7d..bc47eca 100644 --- a/chrome/browser/autofill/autofill_cc_infobar_delegate.cc +++ b/chrome/browser/autofill/autofill_cc_infobar_delegate.cc @@ -9,6 +9,7 @@ #include "base/histogram.h" #include "chrome/browser/autofill/autofill_cc_infobar.h" #include "chrome/browser/autofill/autofill_manager.h" +#include "chrome/browser/browser_list.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -92,8 +93,9 @@ string16 AutoFillCCInfoBarDelegate::GetLinkText() { } bool AutoFillCCInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) { - host_->tab_contents()->OpenURL(GURL(kAutoFillLearnMoreUrl), GURL(), - NEW_FOREGROUND_TAB, PageTransition::TYPED); + Browser* browser = BrowserList::GetLastActive(); + DCHECK(browser); + browser->OpenAutoFillHelpTabAndActivate(); return false; } diff --git a/chrome/browser/autofill/autofill_dialog_gtk.cc b/chrome/browser/autofill/autofill_dialog_gtk.cc index 1e6a12b..bc305ff 100644 --- a/chrome/browser/autofill/autofill_dialog_gtk.cc +++ b/chrome/browser/autofill/autofill_dialog_gtk.cc @@ -366,8 +366,9 @@ gboolean AutoFillDialog::OnSelectionFilter(GtkTreeSelection* selection, void AutoFillDialog::OnLinkActivated() { Browser* browser = BrowserList::GetLastActive(); - browser->OpenURL(GURL(kAutoFillLearnMoreUrl), GURL(), NEW_FOREGROUND_TAB, - PageTransition::TYPED); + if (!browser || !browser->GetSelectedTabContents()) + browser = Browser::Create(profile_); + browser->OpenAutoFillHelpTabAndActivate(); } void AutoFillDialog::LoadAutoFillData() { diff --git a/chrome/browser/autofill/autofill_manager.cc b/chrome/browser/autofill/autofill_manager.cc index 3bc138d..dcd6e8a 100644 --- a/chrome/browser/autofill/autofill_manager.cc +++ b/chrome/browser/autofill/autofill_manager.cc @@ -92,10 +92,6 @@ bool FormIsHTTPS(FormStructure* form) { } // namespace -// TODO(jhawkins): Maybe this should be in a grd file? -const char* kAutoFillLearnMoreUrl = - "http://www.google.com/support/chrome/bin/answer.py?answer=142893"; - AutoFillManager::AutoFillManager(TabContents* tab_contents) : tab_contents_(tab_contents), personal_data_(NULL), diff --git a/chrome/browser/autofill/autofill_manager.h b/chrome/browser/autofill/autofill_manager.h index d46e19e..c18ad84 100644 --- a/chrome/browser/autofill/autofill_manager.h +++ b/chrome/browser/autofill/autofill_manager.h @@ -30,9 +30,6 @@ struct FormData; class FormField; } // namespace webkit_glue -// TODO(jhawkins): Maybe this should be in a grd file? -extern const char* kAutoFillLearnMoreUrl; - // Manages saving and restoring the user's personal information entered into web // forms. class AutoFillManager : public RenderViewHostDelegate::AutoFill, |