Merge r33241 to the 249 branch....

chrome/chrome.gyp

 # Copyright (c) 2009 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
@@ skipping 1035 matching lines @@
         'browser/cocoa/about_ipc_bridge.h',
         'browser/cocoa/about_ipc_bridge.mm',
         'browser/cocoa/about_ipc_controller.h',
         'browser/cocoa/about_ipc_controller.mm',
         'browser/cocoa/about_ipc_dialog.h',
         'browser/cocoa/about_ipc_dialog.mm',
         'browser/cocoa/about_window_controller.h',
         'browser/cocoa/about_window_controller.mm',
         'browser/cocoa/animatable_view.h',
         'browser/cocoa/animatable_view.mm',
+        'browser/cocoa/authorization_util.cc',
+        'browser/cocoa/authorization_util.h',
         'browser/cocoa/autocomplete_text_field.h',
         'browser/cocoa/autocomplete_text_field.mm',
         'browser/cocoa/autocomplete_text_field_cell.h',
         'browser/cocoa/autocomplete_text_field_cell.mm',
         'browser/cocoa/autocomplete_text_field_editor.h',
         'browser/cocoa/autocomplete_text_field_editor.mm',
         'browser/cocoa/back_forward_menu_controller.h',
         'browser/cocoa/back_forward_menu_controller.mm',
         'browser/cocoa/background_gradient_view.h',
         'browser/cocoa/background_gradient_view.mm',
@@ skipping 141 matching lines @@
         'browser/cocoa/infobar.h',
         'browser/cocoa/infobar_container_controller.h',
         'browser/cocoa/infobar_container_controller.mm',
         'browser/cocoa/infobar_controller.h',
         'browser/cocoa/infobar_controller.mm',
         'browser/cocoa/infobar_gradient_view.h',
         'browser/cocoa/infobar_gradient_view.mm',
         'browser/cocoa/infobar_test_helper.h',
         'browser/cocoa/infobar_text_field.h',
         'browser/cocoa/infobar_text_field.mm',
+        'browser/cocoa/keystone_glue.h',
+        'browser/cocoa/keystone_glue.mm',
+        'browser/cocoa/keystone_infobar.h',
+        'browser/cocoa/keystone_infobar.mm',
         'browser/cocoa/keyword_editor_cocoa_controller.h',
         'browser/cocoa/keyword_editor_cocoa_controller.mm',
         'browser/cocoa/location_bar_view_mac.h',
         'browser/cocoa/location_bar_view_mac.mm',
         'browser/cocoa/menu_button.h',
         'browser/cocoa/menu_button.mm',
         'browser/cocoa/multi_key_equivalent_button.h',
         'browser/cocoa/multi_key_equivalent_button.mm',
         'browser/cocoa/nsmenuitem_additions.h',
         'browser/cocoa/nsmenuitem_additions.mm',
         'browser/cocoa/nswindow_local_state.h',
         'browser/cocoa/nswindow_local_state.mm',
         'browser/cocoa/objc_method_swizzle.h',
         'browser/cocoa/objc_method_swizzle.mm',
         'browser/cocoa/page_info_window_controller.h',
         'browser/cocoa/page_info_window_controller.mm',
         'browser/cocoa/page_info_window_mac.h',
         'browser/cocoa/page_info_window_mac.mm',
         'browser/cocoa/preferences_window_controller.h',
         'browser/cocoa/preferences_window_controller.mm',
         'browser/cocoa/rwhvm_editcommand_helper.h',
         'browser/cocoa/rwhvm_editcommand_helper.mm',
         'browser/cocoa/repost_form_warning_mac.h',
         'browser/cocoa/repost_form_warning_mac.mm',
         'browser/cocoa/restart_browser.h',
         'browser/cocoa/restart_browser.mm',
         'browser/cocoa/sad_tab_view.h',
         'browser/cocoa/sad_tab_view.mm',
+        'browser/cocoa/scoped_authorizationref.h',
         'browser/cocoa/search_engine_list_model.h',
         'browser/cocoa/search_engine_list_model.mm',
         'browser/cocoa/shell_dialogs_mac.mm',
         'browser/cocoa/status_bubble_mac.h',
         'browser/cocoa/status_bubble_mac.mm',
         'browser/cocoa/styled_text_field.h',
         'browser/cocoa/styled_text_field.mm',
         'browser/cocoa/styled_text_field_cell.h',
         'browser/cocoa/styled_text_field_cell.mm',
         'browser/cocoa/tab_contents_controller.h',
@@ skipping 3066 matching lines @@
             'browser/process_singleton_linux_uitest.cc',
           ],
         }],
         ['OS=="linux" and toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
         }],
         ['OS=="mac"', {
           'sources': [
-            'app/keystone_glue.h',
-            'app/keystone_glue.mm',
             'app/breakpad_mac_stubs.mm',
           ],
           'sources!': [
             # TODO(port)
             'app/chrome_main_uitest.cc',
             'browser/login_prompt_uitest.cc',
             'browser/metrics/metrics_service_uitest.cc',
             # leaves an extra window on screen after test completes.
             'browser/sessions/session_restore_uitest.cc',
             # puts up modal dialogs.
@@ skipping 143 matching lines @@
       'defines': [
         'CLD_WINDOWS',
       ],
       'direct_dependent_settings': {
         'defines': [
           'CLD_WINDOWS',
         ],
       },
       'sources': [
         'app/breakpad_mac_stubs.mm',
-        # *NO* files in chrome/app have unit tests (except keystone_glue)!!!
-        # It seems a waste to have an app_unittests target, so for now
-        # I add keystone_glue.mm explicitly to this target.
-        'app/keystone_glue.mm',
-        'app/keystone_glue_unittest.mm',
         # All unittests in browser, common, and renderer.
         'browser/app_controller_mac_unittest.mm',
         'browser/autocomplete/autocomplete_edit_view_mac_unittest.mm',
         'browser/autocomplete/autocomplete_unittest.cc',
         'browser/autocomplete/autocomplete_popup_view_mac_unittest.mm',
         'browser/autocomplete/history_contents_provider_unittest.cc',
         'browser/autocomplete/history_url_provider_unittest.cc',
         'browser/autocomplete/keyword_provider_unittest.cc',
         'browser/autocomplete/search_provider_unittest.cc',
         'browser/back_forward_menu_model_unittest.cc',
@@ skipping 81 matching lines @@
         'browser/cocoa/focus_tracker_unittest.mm',
         'browser/cocoa/fullscreen_window_unittest.mm',
         'browser/cocoa/html_dialog_window_controller_unittest.mm',
         'browser/cocoa/hung_renderer_controller_unittest.mm',
         'browser/cocoa/info_bubble_view_unittest.mm',
         'browser/cocoa/info_bubble_window_unittest.mm',
         'browser/cocoa/infobar_container_controller_unittest.mm',
         'browser/cocoa/infobar_controller_unittest.mm',
         'browser/cocoa/infobar_gradient_view_unittest.mm',
         'browser/cocoa/infobar_text_field_unittest.mm',
+        'browser/cocoa/keystone_glue_unittest.mm',
         'browser/cocoa/keyword_editor_cocoa_controller_unittest.mm',
         'browser/cocoa/location_bar_view_mac_unittest.mm',
         'browser/cocoa/gradient_button_cell_unittest.mm',
         'browser/cocoa/history_menu_bridge_unittest.mm',
         'browser/cocoa/history_menu_cocoa_controller_unittest.mm',
         'browser/cocoa/hyperlink_button_cell_unittest.mm',
         'browser/cocoa/import_settings_dialog_unittest.mm',
         'browser/cocoa/menu_button_unittest.mm',
         'browser/cocoa/nsimage_cache_unittest.mm',
         'browser/cocoa/nsmenuitem_additions_unittest.mm',
@@ skipping 757 matching lines @@
             '../build/linux/system.gyp:gtk'
           ],
         }],
       ],
     },
     {
       'target_name': 'sync_unit_tests',
       'type': 'executable',
       'sources': [
         'app/breakpad_mac_stubs.mm',
-        'app/keystone_glue.mm',
         'browser/sync/engine/all_status_unittest.cc',
         'browser/sync/engine/apply_updates_command_unittest.cc',
         'browser/sync/engine/auth_watcher_unittest.cc',
         'browser/sync/engine/net/gaia_authenticator_unittest.cc',
         'browser/sync/engine/syncer_proto_util_unittest.cc',
         'browser/sync/engine/syncer_thread_unittest.cc',
         'browser/sync/engine/syncer_unittest.cc',
         'browser/sync/engine/syncproto_unittest.cc',
         'browser/sync/notifier/listener/talk_mediator_unittest.cc',
         'browser/sync/syncable/syncable_id_unittest.cc',
@@ skipping 360 matching lines @@
                 'INFOPLIST_FILE': 'app/framework-Info.plist',
 
                 # Define the order of symbols within the framework.  This
                 # sets -order_file.
                 'ORDER_FILE': 'app/framework.order',
               },
               'sources': [
                 'app/chrome_dll_main.cc',
                 'app/chrome_dll_resource.h',
                 'app/chrome_exe_main.mm',
-                'app/keystone_glue.h',
-                'app/keystone_glue.mm',
               ],
               # TODO(mark): Come up with a fancier way to do this.  It should
               # only be necessary to list framework-Info.plist once, not the
               # three times it is listed here.
               'mac_bundle_resources': [
                 'app/framework-Info.plist',
                 'app/nibs/About.xib',
                 'app/nibs/AboutIPC.xib',
                 'app/nibs/BookmarkAllTabs.xib',
                 'app/nibs/BookmarkBar.xib',
@@ skipping 236 matching lines @@
                     '../breakpad/breakpad.gyp:breakpad',
                   ],
                 }, {  # else: mac_breakpad!=1
                   # No Breakpad, put in the stubs.
                   'sources': [
                     'app/breakpad_mac_stubs.mm',
                     'app/breakpad_mac.h',
                   ],
                 }],  # mac_breakpad
                 ['mac_keystone==1', {
+                  'variables': {
+                    'conditions': [
+                      ['branding=="Chrome"', {
+                        'theme_dir_name': 'google_chrome',
+                      }, {  # else: 'branding!="Chrome"
+                        'theme_dir_name': 'chromium',
+                      }],
+                    ],
+                  },
+                  'mac_bundle_resources': [
+                    # This image is used to badge the lock icon in the
+                    # promotion authentication dialog.  It needs to exist as
+                    # a file on disk and not just something in a resource
+                    # bundle because that's the interface that Authorization
+                    # Services uses.  Also, Authorization Services can't deal
+                    # with .icns files.
+                    'app/theme/<(theme_dir_name)/product_logo_32.png',
+
+                    'browser/cocoa/keystone_promote_preflight.sh',
+                    'browser/cocoa/keystone_promote_postflight.sh',
+                  ],
                   'postbuilds': [
                     {
                       'postbuild_name': 'Copy KeystoneRegistration.framework',
                       'action': [
                         'tools/build/mac/copy_framework_unversioned',
                         '../third_party/googlemac/Releases/Keystone/KeystoneRegistration.framework',
                         '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Frameworks',
                       ],
                     },
                     {
@@ skipping 1050 matching lines @@
       ]
     }],
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: