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

chrome/chrome_browser_ui.gypi

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'browser_ui',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 258 matching lines @@
         'browser/ui/aura/chrome_browser_main_extra_parts_aura.h',
         'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.cc',
         'browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h',
         'browser/ui/aura/tabs/dock_info_aurax11.cc',
         'browser/ui/autofill/account_chooser_model.cc',
         'browser/ui/autofill/account_chooser_model.h',
         'browser/ui/autofill/autocheckout_bubble.h',
         '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',
         'browser/ui/autofill/autofill_dialog_models.h',
         'browser/ui/autofill/autofill_dialog_sign_in_delegate.cc',
         'browser/ui/autofill/autofill_dialog_sign_in_delegate.h',
         'browser/ui/autofill/autofill_dialog_types.cc',
         'browser/ui/autofill/autofill_dialog_types.h',
         'browser/ui/autofill/autofill_dialog_view.cc',
         'browser/ui/autofill/autofill_dialog_view.h',
@@ skipping 1239 matching lines @@
         'browser/ui/views/app_list/app_list_controller_win.cc',
         'browser/ui/views/apps/chrome_shell_window_delegate_views.cc',
         'browser/ui/views/apps/native_app_window_views.cc',
         'browser/ui/views/apps/native_app_window_views.h',
         'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc',
         'browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h',
         'browser/ui/views/ash/tab_scrubber.h',
         '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',
         'browser/ui/views/avatar_menu_bubble_view.h',
         'browser/ui/views/avatar_menu_button.cc',
         'browser/ui/views/avatar_menu_button.h',
         'browser/ui/views/avatar_label.cc',
         'browser/ui/views/avatar_label.cc',
         'browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc',
         'browser/ui/views/bookmarks/bookmark_bar_instructions_view.h',
@@ skipping 214 matching lines @@
         'browser/ui/views/infobars/translate_infobar_base.cc',
         'browser/ui/views/infobars/translate_infobar_base.h',
         'browser/ui/views/infobars/translate_language_menu_model.cc',
         'browser/ui/views/infobars/translate_language_menu_model.h',
         'browser/ui/views/infobars/translate_message_infobar.cc',
         'browser/ui/views/infobars/translate_message_infobar.h',
         'browser/ui/views/javascript_app_modal_dialog_views.cc',
         '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',
         'browser/ui/views/location_bar/ev_bubble_view.h',
         'browser/ui/views/location_bar/icon_label_bubble_view.cc',
         'browser/ui/views/location_bar/icon_label_bubble_view.h',
         'browser/ui/views/location_bar/keyword_hint_view.cc',
         'browser/ui/views/location_bar/keyword_hint_view.h',
         'browser/ui/views/location_bar/location_bar_decoration_view.cc',
         'browser/ui/views/location_bar/location_bar_decoration_view.h',
@@ skipping 1103 matching lines @@
             ['exclude', '^browser/ui/webui/help/'],
             ['exclude', '^browser/ui/webui/inspect_'],
             ['exclude', '^browser/ui/webui/options'],
             ['exclude', '^browser/ui/webui/options'],
             ['exclude', '^browser/ui/webui/signin/'],
             ['exclude', '^browser/ui/webui/suggestions_internals'],
             ['exclude', '^browser/ui/webui/sync_file_system_internals'],
             ['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!': [
             'browser/ui/certificate_dialogs.cc',
             'browser/ui/certificate_dialogs.h',
             'browser/ui/crypto_module_password_dialog.cc',
             'browser/ui/crypto_module_password_dialog_nss.cc',
             'browser/ui/screen_capture_notification_ui_stub.cc',
             'browser/ui/tabs/dock_info.cc',
             'browser/ui/tabs/tab_resources.cc',
@@ skipping 175 matching lines @@
         ['enable_webrtc==0', {
           'sources!': [
             'browser/ui/webui/media/webrtc_logs_ui.cc',
             'browser/ui/webui/media/webrtc_logs_ui.h',
           ],
         }],
       ],
     },
   ],
 }