Merge 262276 "Remove references to WebContentsView::SizeContents..."

apps/apps.gypi

 # Copyright 2013 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': 'apps',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 49 matching lines @@
         'saved_files_service_factory.h',
         'size_constraints.cc',
         'size_constraints.h',
         'switches.cc',
         'switches.h',
         'ui/native_app_window.h',
         'ui/views/app_window_frame_view.cc',
         'ui/views/app_window_frame_view.h',
         'ui/views/native_app_window_views.cc',
         'ui/views/native_app_window_views.h',
+        'ui/web_contents_sizer.h',
       ],
       'conditions': [
+        ['OS=="mac"', {
+          'sources': [
+            'ui/web_contents_sizer.mm',
+          ],
+        }, {  # OS!=mac
+          'sources': [
+            'ui/web_contents_sizer.cc',
+          ],
+        }],
         ['chromeos==1',
           {
             'dependencies': [
               'browser_chromeos',
             ]
           }
         ],
         ['enable_extensions==0',
           {
             'sources/': [
@@ skipping 172 matching lines @@
             'test/app_shell_test.cc',
             'test/apps_test_launcher_delegate.cc',
             'test/apps_test_launcher_delegate.h',
             'test/apps_tests_main.cc',
           ],
         },
       ],  # targets
     }],  # chromeos==1 or linux aura or win aura
   ],  # conditions
 }