Merge 184110

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 1278 matching lines @@
         'browser/ui/status_bubble.h',
         'browser/ui/sync/browser_synced_window_delegate.h',
         'browser/ui/sync/browser_synced_window_delegate.cc',
         'browser/ui/sync/one_click_signin_helper.cc',
         'browser/ui/sync/one_click_signin_helper.h',
         'browser/ui/sync/one_click_signin_histogram.h',
         'browser/ui/sync/one_click_signin_infobar_delegate.cc',
         'browser/ui/sync/one_click_signin_infobar_delegate.h',
         'browser/ui/sync/one_click_signin_sync_starter.cc',
         'browser/ui/sync/one_click_signin_sync_starter.h',
+        'browser/ui/sync/signin_histogram.h',
         'browser/ui/sync/tab_contents_synced_tab_delegate.cc',
         'browser/ui/sync/tab_contents_synced_tab_delegate.h',
         'browser/ui/tab_contents/chrome_web_contents_view_delegate.h',
         'browser/ui/tab_contents/core_tab_helper.cc',
         'browser/ui/tab_contents/core_tab_helper.h',
         'browser/ui/tab_contents/core_tab_helper_delegate.cc',
         'browser/ui/tab_contents/core_tab_helper_delegate.h',
         'browser/ui/tab_contents/tab_contents_iterator.cc',
         'browser/ui/tab_contents/tab_contents_iterator.h',
         'browser/ui/tab_modal_confirm_dialog.h',
@@ skipping 1497 matching lines @@
         }],
         ['enable_message_center==1', {
           'dependencies': [
             '../ui/message_center/message_center.gyp:message_center',
           ],
         }],
       ],
     },
   ],
 }