Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2965)

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 21668003: Implement newly saved card bubble for realz and update generated card bubble to (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/google_chrome_strings.grd ('k') | chrome/browser/ui/autofill/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index c3c90fca324033dd1b2bde0bc748e29a1c4c10a9..948ba0264deb49f59abb8efb856366f09a4518ca 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);
« no previous file with comments | « chrome/app/google_chrome_strings.grd ('k') | chrome/browser/ui/autofill/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698