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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 8509027: Add status area to Aura builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move status area view ids back to chromeos Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/views/aura/status_area_host_aura.cc ('k') | chrome/common/chrome_switches.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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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': 'static_library', 9 'type': 'static_library',
10 'dependencies': [ 10 'dependencies': [
(...skipping 3242 matching lines...) Expand 10 before | Expand all | Expand 10 after
3253 'browser/ui/views/app_menu_button_win.cc', 3253 'browser/ui/views/app_menu_button_win.cc',
3254 'browser/ui/views/app_menu_button_win.h', 3254 'browser/ui/views/app_menu_button_win.h',
3255 'browser/ui/views/appcache_info_view.cc', 3255 'browser/ui/views/appcache_info_view.cc',
3256 'browser/ui/views/appcache_info_view.h', 3256 'browser/ui/views/appcache_info_view.h',
3257 'browser/ui/views/aura/app_list_window.cc', 3257 'browser/ui/views/aura/app_list_window.cc',
3258 'browser/ui/views/aura/app_list_window.h', 3258 'browser/ui/views/aura/app_list_window.h',
3259 'browser/ui/views/aura/chrome_shell_delegate.cc', 3259 'browser/ui/views/aura/chrome_shell_delegate.cc',
3260 'browser/ui/views/aura/chrome_shell_delegate.h', 3260 'browser/ui/views/aura/chrome_shell_delegate.h',
3261 'browser/ui/views/aura/launcher_icon_updater.cc', 3261 'browser/ui/views/aura/launcher_icon_updater.cc',
3262 'browser/ui/views/aura/launcher_icon_updater.h', 3262 'browser/ui/views/aura/launcher_icon_updater.h',
3263 'browser/ui/views/aura/status_area_host_aura.cc',
3264 'browser/ui/views/aura/status_area_host_aura.h',
3263 'browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc', 3265 'browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc',
3264 'browser/ui/views/autocomplete/autocomplete_popup_contents_view.h', 3266 'browser/ui/views/autocomplete/autocomplete_popup_contents_view.h',
3265 'browser/ui/views/autocomplete/autocomplete_result_view.cc', 3267 'browser/ui/views/autocomplete/autocomplete_result_view.cc',
3266 'browser/ui/views/autocomplete/autocomplete_result_view.h', 3268 'browser/ui/views/autocomplete/autocomplete_result_view.h',
3267 'browser/ui/views/autocomplete/autocomplete_result_view_model.h', 3269 'browser/ui/views/autocomplete/autocomplete_result_view_model.h',
3268 'browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc ', 3270 'browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc ',
3269 'browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h' , 3271 'browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h' ,
3270 'browser/ui/views/avatar_menu_bubble_view.cc', 3272 'browser/ui/views/avatar_menu_bubble_view.cc',
3271 'browser/ui/views/avatar_menu_bubble_view.h', 3273 'browser/ui/views/avatar_menu_bubble_view.h',
3272 'browser/ui/views/avatar_menu_button.cc', 3274 'browser/ui/views/avatar_menu_button.cc',
(...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after
4136 ['exclude', '^browser/chromeos/frame/browser_non_client_frame_view_f actory_chromeos.cc'], 4138 ['exclude', '^browser/chromeos/frame/browser_non_client_frame_view_f actory_chromeos.cc'],
4137 ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'] , 4139 ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'] ,
4138 ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'], 4140 ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'],
4139 ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_f actory_x11.cc'], 4141 ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_f actory_x11.cc'],
4140 ['exclude', '^browser/ui/views/handle_web_keyboard_event_gtk.cc'], 4142 ['exclude', '^browser/ui/views/handle_web_keyboard_event_gtk.cc'],
4141 ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view _gtk.*'], 4143 ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view _gtk.*'],
4142 ['exclude', '^browser/chromeos/input_method/candidate_window.cc'], 4144 ['exclude', '^browser/chromeos/input_method/candidate_window.cc'],
4143 ['exclude', '^browser/chromeos/input_method/candidate_window.h'], 4145 ['exclude', '^browser/chromeos/input_method/candidate_window.h'],
4144 ], 4146 ],
4145 }], 4147 }],
4148 # For now, always include status area code for aura builds, even
4149 # though the code is under browser/chromeos.
4150 # TODO: (stevenjb/beng): Find a home for these.
4151 ['use_aura==1', {
4152 'sources/': [
4153 ['include', '^browser/chromeos/status/clock_menu_button.cc'],
4154 ['include', '^browser/chromeos/status/clock_menu_button.h'],
4155 ['include', '^browser/chromeos/status/status_area_button.cc'],
4156 ['include', '^browser/chromeos/status/status_area_button.h'],
4157 ['include', '^browser/chromeos/status/status_area_view.cc'],
4158 ['include', '^browser/chromeos/status/status_area_view.h'],
4159 ],
4160 }],
4161 # linux/chromeos only status area button.
4162 ['OS=="linux" and use_aura==1', {
4163 'sources/': [
4164 ['include', '^browser/chromeos/status/memory_menu_button.cc'],
4165 ['include', '^browser/chromeos/status/memory_menu_button.h'],
4166 ],
4167 }],
4146 ['use_aura==1', { 4168 ['use_aura==1', {
4147 'sources/': [ 4169 'sources/': [
4148 ['exclude', '^browser/aeropeek_manager.cc'], 4170 ['exclude', '^browser/aeropeek_manager.cc'],
4149 ['exclude', '^browser/automation/automation_provider_win.cc'], 4171 ['exclude', '^browser/automation/automation_provider_win.cc'],
4150 ['exclude', '^browser/automation/testing_automation_provider_win.cc' ], 4172 ['exclude', '^browser/automation/testing_automation_provider_win.cc' ],
4151 ['exclude', '^browser/chromeos/native_dialog_window.cc'], 4173 ['exclude', '^browser/chromeos/native_dialog_window.cc'],
4152 ['exclude', '^browser/chromeos/native_dialog_window.h'], 4174 ['exclude', '^browser/chromeos/native_dialog_window.h'],
4153 ['exclude', '^browser/external_tab_container_win.cc'], 4175 ['exclude', '^browser/external_tab_container_win.cc'],
4154 ['exclude', '^browser/external_tab_container_win.h'], 4176 ['exclude', '^browser/external_tab_container_win.h'],
4155 ['exclude', '^browser/first_run/first_run_win.cc'], 4177 ['exclude', '^browser/first_run/first_run_win.cc'],
(...skipping 1086 matching lines...) Expand 10 before | Expand all | Expand 10 after
5242 'type': 'static_library', 5264 'type': 'static_library',
5243 'sources': [ 'browser/history/in_memory_url_index_cache.proto' ], 5265 'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
5244 'variables': { 5266 'variables': {
5245 'proto_in_dir': 'browser/history', 5267 'proto_in_dir': 'browser/history',
5246 'proto_out_dir': 'chrome/browser/history', 5268 'proto_out_dir': 'chrome/browser/history',
5247 }, 5269 },
5248 'includes': [ '../build/protoc.gypi' ] 5270 'includes': [ '../build/protoc.gypi' ]
5249 }, 5271 },
5250 ], 5272 ],
5251 } 5273 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/aura/status_area_host_aura.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698