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

Side by Side Diff: chrome/chrome.gyp

Issue 337025: Design changes in browser/privacy_blacklist needed to integrate (Closed)
Patch Set: fixes Created 11 years, 1 month 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 | « chrome/browser/views/blacklist_error_dialog.cc ('k') | chrome/common/notification_type.h » ('j') | 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'variables': { 9 'variables': {
10 'version_py_path': 'tools/build/version.py', 10 'version_py_path': 'tools/build/version.py',
(...skipping 2136 matching lines...) Expand 10 before | Expand all | Expand 10 after
2147 'browser/views/about_network_dialog.cc', 2147 'browser/views/about_network_dialog.cc',
2148 'browser/views/about_network_dialog.h', 2148 'browser/views/about_network_dialog.h',
2149 'browser/views/accelerator_table_gtk.cc', 2149 'browser/views/accelerator_table_gtk.cc',
2150 'browser/views/accelerator_table_gtk.h', 2150 'browser/views/accelerator_table_gtk.h',
2151 'browser/views/autocomplete/autocomplete_popup_contents_view.cc', 2151 'browser/views/autocomplete/autocomplete_popup_contents_view.cc',
2152 'browser/views/autocomplete/autocomplete_popup_contents_view.h', 2152 'browser/views/autocomplete/autocomplete_popup_contents_view.h',
2153 'browser/views/autocomplete/autocomplete_popup_win.cc', 2153 'browser/views/autocomplete/autocomplete_popup_win.cc',
2154 'browser/views/autocomplete/autocomplete_popup_win.h', 2154 'browser/views/autocomplete/autocomplete_popup_win.h',
2155 'browser/views/autocomplete/autocomplete_popup_gtk.cc', 2155 'browser/views/autocomplete/autocomplete_popup_gtk.cc',
2156 'browser/views/autocomplete/autocomplete_popup_gtk.h', 2156 'browser/views/autocomplete/autocomplete_popup_gtk.h',
2157 'browser/views/blacklist_error_dialog.cc',
2158 'browser/views/blacklist_error_dialog.h',
2159 'browser/views/blocked_popup_container_view_views.cc', 2157 'browser/views/blocked_popup_container_view_views.cc',
2160 'browser/views/blocked_popup_container_view_views.h', 2158 'browser/views/blocked_popup_container_view_views.h',
2161 'browser/views/bookmark_bar_view.cc', 2159 'browser/views/bookmark_bar_view.cc',
2162 'browser/views/bookmark_bar_view.h', 2160 'browser/views/bookmark_bar_view.h',
2163 'browser/views/bookmark_bubble_view.cc', 2161 'browser/views/bookmark_bubble_view.cc',
2164 'browser/views/bookmark_bubble_view.h', 2162 'browser/views/bookmark_bubble_view.h',
2165 'browser/views/bookmark_context_menu.cc', 2163 'browser/views/bookmark_context_menu.cc',
2166 'browser/views/bookmark_context_menu.h', 2164 'browser/views/bookmark_context_menu.h',
2167 'browser/views/bookmark_editor_view.cc', 2165 'browser/views/bookmark_editor_view.cc',
2168 'browser/views/bookmark_editor_view.h', 2166 'browser/views/bookmark_editor_view.h',
(...skipping 3993 matching lines...) Expand 10 before | Expand all | Expand 10 after
6162 'msvs_guid': '4539AFB3-B8DC-47F3-A491-6DAC8FD26657', 6160 'msvs_guid': '4539AFB3-B8DC-47F3-A491-6DAC8FD26657',
6163 'dependencies': [ 6161 'dependencies': [
6164 '../base/base.gyp:base', 6162 '../base/base.gyp:base',
6165 '../base/base.gyp:test_support_base', 6163 '../base/base.gyp:test_support_base',
6166 ], 6164 ],
6167 'sources': [ 6165 'sources': [
6168 'tools/perf/flush_cache/flush_cache.cc', 6166 'tools/perf/flush_cache/flush_cache.cc',
6169 ], 6167 ],
6170 }, 6168 },
6171 { 6169 {
6172 'target_name': 'pbl_tool',
6173 'type': 'executable',
6174 'msvs_guid': '265C427B-D1FF-4922-A47C-0754DDFF52E1',
6175 'dependencies': [
6176 '../app/app.gyp:app_base',
6177 '../base/base.gyp:base',
6178 '../webkit/webkit.gyp:glue',
6179 'browser',
6180 'debugger',
6181 'renderer',
6182 ],
6183 'sources': [
6184 'tools/pbl_tool/pbl_tool.cc',
6185 ],
6186 'conditions': [
6187 ['OS=="win"', {
6188 'dependencies': [
6189 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
6190 ],
6191 },],
6192 ],
6193 },
6194 {
6195 'target_name': 'perf_tests', 6170 'target_name': 'perf_tests',
6196 'type': 'executable', 6171 'type': 'executable',
6197 'msvs_guid': '9055E088-25C6-47FD-87D5-D9DD9FD75C9F', 6172 'msvs_guid': '9055E088-25C6-47FD-87D5-D9DD9FD75C9F',
6198 'dependencies': [ 6173 'dependencies': [
6199 'browser', 6174 'browser',
6200 'common', 6175 'common',
6201 'debugger', 6176 'debugger',
6202 'renderer', 6177 'renderer',
6203 'syncapi', 6178 'syncapi',
6204 'chrome_resources', 6179 'chrome_resources',
(...skipping 750 matching lines...) Expand 10 before | Expand all | Expand 10 after
6955 ] 6930 ]
6956 }], 6931 }],
6957 ], # 'conditions' 6932 ], # 'conditions'
6958 } 6933 }
6959 6934
6960 # Local Variables: 6935 # Local Variables:
6961 # tab-width:2 6936 # tab-width:2
6962 # indent-tabs-mode:nil 6937 # indent-tabs-mode:nil
6963 # End: 6938 # End:
6964 # vim: set expandtab tabstop=2 shiftwidth=2: 6939 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/browser/views/blacklist_error_dialog.cc ('k') | chrome/common/notification_type.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698