diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-10 18:13:13 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-10 18:13:13 +0000 |
| commit | c9104c687d28387df1492997ca1b24d7e6ad31bd (patch) | |
| tree | f0b8d30698b2a135cb0305c1281ca75c6b5ca502 /chrome/browser/prefs | |
| parent | 4bfc87bd4a057e08bf484da373c4de374c21ec91 (diff) | |
| download | chromium_src-c9104c687d28387df1492997ca1b24d7e6ad31bd.zip chromium_src-c9104c687d28387df1492997ca1b24d7e6ad31bd.tar.gz chromium_src-c9104c687d28387df1492997ca1b24d7e6ad31bd.tar.bz2 | |
Implement newly saved card bubble for realz and update generated card bubble to match mocks and updated product requirements.
Because these bubbles are not particularly similar any more, this CL splits them into separate interfaces (and hence separate controllers, files, test, etc.).
Functional changes to generated card bubble:
- removed link from bottom
- added link to end of header text
Functional changes to new card bubble:
- removed bubble/window title
- added card description (icon + title + label)
- made link and header text real translations
R=estade@chromium.org
BUG=263156,263158
TBR=sky@chromium.org (for 1 char change to ui/views/window/non_client_view.h)
NOTRY=True
Review URL: https://chromiumcodereview.appspot.com/21668003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216880 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index c3c90fc..948ba02 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -71,7 +71,6 @@ #include "chrome/browser/translate/translate_prefs.h" #include "chrome/browser/ui/alternate_error_tab_observer.h" #include "chrome/browser/ui/app_list/app_list_service.h" -#include "chrome/browser/ui/autofill/autofill_credit_card_bubble_controller.h" #include "chrome/browser/ui/browser_ui_prefs.h" #include "chrome/browser/ui/network_profile_bubble.h" #include "chrome/browser/ui/prefs/prefs_tab_helper.h" @@ -156,6 +155,8 @@ #if defined(OS_ANDROID) #include "chrome/browser/ui/webui/ntp/android/promo_handler.h" +#else +#include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" #endif #if defined(ENABLE_PLUGIN_INSTALLATION) @@ -290,8 +291,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { // User prefs. Please keep this list alphabetized. AlternateErrorPageTabObserver::RegisterProfilePrefs(registry); apps::RegisterProfilePrefs(registry); - autofill::AutofillCreditCardBubbleController::RegisterUserPrefs(registry); autofill::AutofillManager::RegisterProfilePrefs(registry); +#if !defined(OS_ANDROID) + autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry); +#endif BookmarkPromptPrefs::RegisterProfilePrefs(registry); bookmark_utils::RegisterProfilePrefs(registry); browser_sync::SyncPrefs::RegisterProfilePrefs(registry); |