Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(121)

Side by Side Diff: chrome/chrome_browser.gypi

Issue 2859012: Mac: Fix duplicate definition of two symbols. (Closed)
Patch Set: Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': '<(library)', 9 'type': '<(library)',
10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA', 10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
(...skipping 2774 matching lines...) Expand 10 before | Expand all | Expand 10 after
2785 ['OS=="mac"', { 2785 ['OS=="mac"', {
2786 'sources!': [ 2786 'sources!': [
2787 'browser/automation/automation_provider_list_generic.cc', 2787 'browser/automation/automation_provider_list_generic.cc',
2788 'browser/bookmarks/bookmark_context_menu.cc', 2788 'browser/bookmarks/bookmark_context_menu.cc',
2789 'browser/bookmarks/bookmark_drop_info.cc', 2789 'browser/bookmarks/bookmark_drop_info.cc',
2790 'browser/browser_list_stub.cc', 2790 'browser/browser_list_stub.cc',
2791 'browser/dock_info.cc', 2791 'browser/dock_info.cc',
2792 'browser/importer/nss_decryptor_system_nss.cc', 2792 'browser/importer/nss_decryptor_system_nss.cc',
2793 'browser/importer/nss_decryptor_system_nss.h', 2793 'browser/importer/nss_decryptor_system_nss.h',
2794 'browser/jankometer.cc', 2794 'browser/jankometer.cc',
2795 'browser/password_manager/login_database_posix.cc',
2795 'browser/renderer_host/backing_store_proxy.cc', 2796 'browser/renderer_host/backing_store_proxy.cc',
2796 'browser/renderer_host/backing_store_proxy.h', 2797 'browser/renderer_host/backing_store_proxy.h',
2797 'browser/renderer_host/gpu_view_host.cc', 2798 'browser/renderer_host/gpu_view_host.cc',
2798 'browser/renderer_host/gpu_view_host.h', 2799 'browser/renderer_host/gpu_view_host.h',
2799 'browser/renderer_host/video_layer_proxy.cc', 2800 'browser/renderer_host/video_layer_proxy.cc',
2800 'browser/renderer_host/video_layer_proxy.h', 2801 'browser/renderer_host/video_layer_proxy.h',
2801 'browser/views/extensions/extension_shelf.cc', 2802 'browser/views/extensions/extension_shelf.cc',
2802 'browser/views/extensions/extension_shelf.h', 2803 'browser/views/extensions/extension_shelf.h',
2803 'browser/views/extensions/extension_view.cc', 2804 'browser/views/extensions/extension_view.cc',
2804 'browser/views/extensions/extension_view.h', 2805 'browser/views/extensions/extension_view.h',
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after
3633 ], 3634 ],
3634 }, 3635 },
3635 ], 3636 ],
3636 } 3637 }
3637 3638
3638 # Local Variables: 3639 # Local Variables:
3639 # tab-width:2 3640 # tab-width:2
3640 # indent-tabs-mode:nil 3641 # indent-tabs-mode:nil
3641 # End: 3642 # End:
3642 # vim: set expandtab tabstop=2 shiftwidth=2: 3643 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698