Implement newly saved card bubble for realz and update generated card bubble to

chrome/chrome_browser_ui.gypi

Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index c9b688554a9bb31d0e02682d0f409fc4dd278b86..7f52835809067e607cac3c3c20fb05d1cd850dc9 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -276,10 +276,6 @@
         'browser/ui/autofill/autocheckout_bubble.cc',
         'browser/ui/autofill/autocheckout_bubble_controller.cc',
         'browser/ui/autofill/autocheckout_bubble_controller.h',
-        'browser/ui/autofill/autofill_credit_card_bubble.cc',
-        'browser/ui/autofill/autofill_credit_card_bubble.h',
-        'browser/ui/autofill/autofill_credit_card_bubble_controller.cc',
-        'browser/ui/autofill/autofill_credit_card_bubble_controller.h',
         'browser/ui/autofill/autofill_dialog_controller_impl.cc',
         'browser/ui/autofill/autofill_dialog_controller_impl.h',
         'browser/ui/autofill/autofill_dialog_models.cc',
@@ -1539,12 +1535,14 @@
         'browser/ui/views/ash/tab_scrubber.cc',
         'browser/ui/views/autofill/autocheckout_bubble_views.cc',
         'browser/ui/views/autofill/autocheckout_bubble_views.h',
-        'browser/ui/views/autofill/autofill_credit_card_bubble_views.cc',
-        'browser/ui/views/autofill/autofill_credit_card_bubble_views.h',
         'browser/ui/views/autofill/autofill_dialog_views.cc',
         'browser/ui/views/autofill/autofill_dialog_views.h',
         'browser/ui/views/autofill/autofill_popup_view_views.cc',
         'browser/ui/views/autofill/autofill_popup_view_views.h',
+        'browser/ui/views/autofill/generated_credit_card_bubble_views.cc',
+        'browser/ui/views/autofill/generated_credit_card_bubble_views.h',
+        'browser/ui/views/autofill/new_credit_card_bubble_views.cc',
+        'browser/ui/views/autofill/new_credit_card_bubble_views.h',
         'browser/ui/views/autofill/decorated_textfield.cc',
         'browser/ui/views/autofill/decorated_textfield.h',
         'browser/ui/views/avatar_menu_bubble_view.cc',
@@ -1779,8 +1777,8 @@
         'browser/ui/views/javascript_app_modal_dialog_views.h',
         'browser/ui/views/load_complete_listener.cc',
         'browser/ui/views/load_complete_listener.h',
-        'browser/ui/views/location_bar/autofill_credit_card_view.cc',
-        'browser/ui/views/location_bar/autofill_credit_card_view.h',
+        'browser/ui/views/location_bar/generated_credit_card_view.cc',
+        'browser/ui/views/location_bar/generated_credit_card_view.h',
         'browser/ui/views/location_bar/content_setting_image_view.cc',
         'browser/ui/views/location_bar/content_setting_image_view.h',
         'browser/ui/views/location_bar/ev_bubble_view.cc',
@@ -2904,6 +2902,17 @@
             ['exclude', '^browser/ui/webui/sync_promo'],
             ['exclude', '^browser/ui/webui/uber'],
           ],
+        }, { # OS!="android"
+          'sources': [
+            'browser/ui/autofill/generated_credit_card_bubble.cc',
+            'browser/ui/autofill/generated_credit_card_bubble.h',
+            'browser/ui/autofill/generated_credit_card_bubble_controller.cc',
+            'browser/ui/autofill/generated_credit_card_bubble_controller.h',
+            'browser/ui/autofill/new_credit_card_bubble.cc',
+            'browser/ui/autofill/new_credit_card_bubble.h',
+            'browser/ui/autofill/new_credit_card_bubble_controller.cc',
+            'browser/ui/autofill/new_credit_card_bubble_controller.h',
+          ],
         }],
         ['OS=="mac"', {
           'sources!': [