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

Side by Side Diff: chrome/chrome_browser_ui.gypi

Issue 1100763002: Inject CanAddURLToHistory into TopSitesImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs
Patch Set: Fix error introduced during rebase Created 5 years, 7 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 | « chrome/chrome_browser_extensions.gypi ('k') | chrome/chrome_installer.gypi » ('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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 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 # There are two sections of sources: 7 # There are two sections of sources:
8 # * "Platform"-based sources (OS, toolkit, etc.) 8 # * "Platform"-based sources (OS, toolkit, etc.)
9 # * Feature/directory-based sources (e.g., history, printing) 9 # * Feature/directory-based sources (e.g., history, printing)
10 10
(...skipping 1429 matching lines...) Expand 10 before | Expand all | Expand 10 after
1440 'browser/ui/cocoa/ui_localizer.h', 1440 'browser/ui/cocoa/ui_localizer.h',
1441 'browser/ui/cocoa/ui_localizer.mm', 1441 'browser/ui/cocoa/ui_localizer.mm',
1442 'browser/ui/cocoa/window_restore_utils.h', 1442 'browser/ui/cocoa/window_restore_utils.h',
1443 'browser/ui/cocoa/window_restore_utils.mm', 1443 'browser/ui/cocoa/window_restore_utils.mm',
1444 'browser/ui/startup/autolaunch_prompt.cc', 1444 'browser/ui/startup/autolaunch_prompt.cc',
1445 'browser/ui/web_contents_sizer.mm', 1445 'browser/ui/web_contents_sizer.mm',
1446 ], 1446 ],
1447 'chrome_browser_ui_media_router_sources': [ 1447 'chrome_browser_ui_media_router_sources': [
1448 'browser/ui/toolbar/media_router_action.h', 1448 'browser/ui/toolbar/media_router_action.h',
1449 'browser/ui/toolbar/media_router_action.cc', 1449 'browser/ui/toolbar/media_router_action.cc',
1450 'browser/ui/webui/media_router/media_cast_mode.cc',
1451 'browser/ui/webui/media_router/media_cast_mode.h',
1452 'browser/ui/webui/media_router/media_sink_with_cast_modes.cc',
1453 'browser/ui/webui/media_router/media_sink_with_cast_modes.h',
1450 ], 1454 ],
1451 'chrome_browser_ui_non_mac_sources': [ 1455 'chrome_browser_ui_non_mac_sources': [
1452 'browser/ui/web_contents_sizer.cc', 1456 'browser/ui/web_contents_sizer.cc',
1453 ], 1457 ],
1454 'chrome_browser_ui_non_mobile_sources': [ 1458 'chrome_browser_ui_non_mobile_sources': [
1455 'browser/ui/apps/app_info_dialog.h', 1459 'browser/ui/apps/app_info_dialog.h',
1456 'browser/ui/apps/apps_metro_handler_win.cc', 1460 'browser/ui/apps/apps_metro_handler_win.cc',
1457 'browser/ui/apps/apps_metro_handler_win.h', 1461 'browser/ui/apps/apps_metro_handler_win.h',
1458 'browser/ui/apps/chrome_app_delegate.cc', 1462 'browser/ui/apps/chrome_app_delegate.cc',
1459 'browser/ui/apps/chrome_app_delegate.h', 1463 'browser/ui/apps/chrome_app_delegate.h',
(...skipping 1664 matching lines...) Expand 10 before | Expand all | Expand 10 after
3124 'browser_extensions', 3128 'browser_extensions',
3125 'browser/extensions/api/api_registration.gyp:chrome_api_registration ', 3129 'browser/extensions/api/api_registration.gyp:chrome_api_registration ',
3126 'common/extensions/api/api.gyp:chrome_api', 3130 'common/extensions/api/api.gyp:chrome_api',
3127 ], 3131 ],
3128 'sources': [ '<@(chrome_browser_ui_extensions_sources)' ], 3132 'sources': [ '<@(chrome_browser_ui_extensions_sources)' ],
3129 }], 3133 }],
3130 ['enable_google_now==1 and OS!="android"', { 3134 ['enable_google_now==1 and OS!="android"', {
3131 'sources': [ '<@(chrome_browser_ui_google_now_non_android_sources)' ], 3135 'sources': [ '<@(chrome_browser_ui_google_now_non_android_sources)' ],
3132 }], 3136 }],
3133 ['enable_media_router==1', { 3137 ['enable_media_router==1', {
3138 'dependencies': [
3139 'browser/media/router/media_router.gyp:media_router',
3140 ],
3134 'sources': [ '<@(chrome_browser_ui_media_router_sources)' ], 3141 'sources': [ '<@(chrome_browser_ui_media_router_sources)' ],
3135 }], 3142 }],
3136 ['enable_supervised_users==0', { 3143 ['enable_supervised_users==0', {
3137 'sources!': [ 3144 'sources!': [
3138 'browser/ui/views/profiles/supervised_user_avatar_label.cc', 3145 'browser/ui/views/profiles/supervised_user_avatar_label.cc',
3139 'browser/ui/views/profiles/supervised_user_avatar_label.h', 3146 'browser/ui/views/profiles/supervised_user_avatar_label.h',
3140 'browser/ui/webui/options/supervised_user_create_confirm_handler.cc' , 3147 'browser/ui/webui/options/supervised_user_create_confirm_handler.cc' ,
3141 'browser/ui/webui/options/supervised_user_create_confirm_handler.h', 3148 'browser/ui/webui/options/supervised_user_create_confirm_handler.h',
3142 'browser/ui/webui/options/supervised_user_import_handler.cc', 3149 'browser/ui/webui/options/supervised_user_import_handler.cc',
3143 'browser/ui/webui/options/supervised_user_import_handler.h', 3150 'browser/ui/webui/options/supervised_user_import_handler.h',
(...skipping 29 matching lines...) Expand all
3173 ], 3180 ],
3174 'sources': [ 3181 'sources': [
3175 '<@(chrome_browser_ui_non_mobile_sources)', 3182 '<@(chrome_browser_ui_non_mobile_sources)',
3176 '<@(chrome_browser_ui_omnibox_non_mobile_sources)', 3183 '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
3177 ], 3184 ],
3178 }], 3185 }],
3179 ], 3186 ],
3180 }, 3187 },
3181 ], 3188 ],
3182 } 3189 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser_extensions.gypi ('k') | chrome/chrome_installer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698