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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 9703031: Retry landing "Enable users change desktop background image from settings page in Chromeos Aura bui… (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge to trunk Created 8 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/webui/options2/options_ui2.cc ('k') | ui/resources/ui_resources.grd » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 'browser/chrome_to_mobile_service.h', 400 'browser/chrome_to_mobile_service.h',
401 'browser/chrome_to_mobile_service_factory.cc', 401 'browser/chrome_to_mobile_service_factory.cc',
402 'browser/chrome_to_mobile_service_factory.h', 402 'browser/chrome_to_mobile_service_factory.h',
403 'browser/chromeos/accessibility/accessibility_util.cc', 403 'browser/chromeos/accessibility/accessibility_util.cc',
404 'browser/chromeos/accessibility/accessibility_util.h', 404 'browser/chromeos/accessibility/accessibility_util.h',
405 'browser/chromeos/audio/audio_handler.cc', 405 'browser/chromeos/audio/audio_handler.cc',
406 'browser/chromeos/audio/audio_handler.h', 406 'browser/chromeos/audio/audio_handler.h',
407 'browser/chromeos/audio/audio_mixer.h', 407 'browser/chromeos/audio/audio_mixer.h',
408 'browser/chromeos/audio/audio_mixer_alsa.cc', 408 'browser/chromeos/audio/audio_mixer_alsa.cc',
409 'browser/chromeos/audio/audio_mixer_alsa.h', 409 'browser/chromeos/audio/audio_mixer_alsa.h',
410 'browser/chromeos/background/desktop_background_observer.cc',
411 'browser/chromeos/background/desktop_background_observer.h',
410 'browser/chromeos/bluetooth/bluetooth_adapter.cc', 412 'browser/chromeos/bluetooth/bluetooth_adapter.cc',
411 'browser/chromeos/bluetooth/bluetooth_adapter.h', 413 'browser/chromeos/bluetooth/bluetooth_adapter.h',
412 'browser/chromeos/bluetooth/bluetooth_device.cc', 414 'browser/chromeos/bluetooth/bluetooth_device.cc',
413 'browser/chromeos/bluetooth/bluetooth_device.h', 415 'browser/chromeos/bluetooth/bluetooth_device.h',
414 'browser/chromeos/boot_times_loader.cc', 416 'browser/chromeos/boot_times_loader.cc',
415 'browser/chromeos/boot_times_loader.h', 417 'browser/chromeos/boot_times_loader.h',
416 'browser/chromeos/choose_mobile_network_dialog.cc', 418 'browser/chromeos/choose_mobile_network_dialog.cc',
417 'browser/chromeos/choose_mobile_network_dialog.h', 419 'browser/chromeos/choose_mobile_network_dialog.h',
418 'browser/chromeos/chrome_browser_main_chromeos.cc', 420 'browser/chromeos/chrome_browser_main_chromeos.cc',
419 'browser/chromeos/chrome_browser_main_chromeos.h', 421 'browser/chromeos/chrome_browser_main_chromeos.h',
(...skipping 3443 matching lines...) Expand 10 before | Expand all | Expand 10 after
3863 'browser/ui/webui/options2/chromeos/language_mozc_handler2.cc', 3865 'browser/ui/webui/options2/chromeos/language_mozc_handler2.cc',
3864 'browser/ui/webui/options2/chromeos/language_mozc_handler2.h', 3866 'browser/ui/webui/options2/chromeos/language_mozc_handler2.h',
3865 'browser/ui/webui/options2/chromeos/language_options_util2.cc', 3867 'browser/ui/webui/options2/chromeos/language_options_util2.cc',
3866 'browser/ui/webui/options2/chromeos/language_options_util2.h', 3868 'browser/ui/webui/options2/chromeos/language_options_util2.h',
3867 'browser/ui/webui/options2/chromeos/language_pinyin_handler2.cc', 3869 'browser/ui/webui/options2/chromeos/language_pinyin_handler2.cc',
3868 'browser/ui/webui/options2/chromeos/language_pinyin_handler2.h', 3870 'browser/ui/webui/options2/chromeos/language_pinyin_handler2.h',
3869 'browser/ui/webui/options2/chromeos/pointer_handler2.cc', 3871 'browser/ui/webui/options2/chromeos/pointer_handler2.cc',
3870 'browser/ui/webui/options2/chromeos/pointer_handler2.h', 3872 'browser/ui/webui/options2/chromeos/pointer_handler2.h',
3871 'browser/ui/webui/options2/chromeos/proxy_handler2.cc', 3873 'browser/ui/webui/options2/chromeos/proxy_handler2.cc',
3872 'browser/ui/webui/options2/chromeos/proxy_handler2.h', 3874 'browser/ui/webui/options2/chromeos/proxy_handler2.h',
3875 'browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc',
3876 'browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.h',
3873 'browser/ui/webui/options2/chromeos/stats_options_handler2.cc', 3877 'browser/ui/webui/options2/chromeos/stats_options_handler2.cc',
3874 'browser/ui/webui/options2/chromeos/stats_options_handler2.h', 3878 'browser/ui/webui/options2/chromeos/stats_options_handler2.h',
3875 'browser/ui/webui/options2/chromeos/system_settings_provider2.cc', 3879 'browser/ui/webui/options2/chromeos/system_settings_provider2.cc',
3876 'browser/ui/webui/options2/chromeos/system_settings_provider2.h', 3880 'browser/ui/webui/options2/chromeos/system_settings_provider2.h',
3877 'browser/ui/webui/options2/chromeos/user_image_source2.cc', 3881 'browser/ui/webui/options2/chromeos/user_image_source2.cc',
3878 'browser/ui/webui/options2/chromeos/user_image_source2.h', 3882 'browser/ui/webui/options2/chromeos/user_image_source2.h',
3879 'browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2.cc ', 3883 'browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2.cc ',
3880 'browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2.h' , 3884 'browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2.h' ,
3881 'browser/ui/webui/options2/clear_browser_data_handler2.cc', 3885 'browser/ui/webui/options2/clear_browser_data_handler2.cc',
3882 'browser/ui/webui/options2/clear_browser_data_handler2.h', 3886 'browser/ui/webui/options2/clear_browser_data_handler2.h',
(...skipping 1471 matching lines...) Expand 10 before | Expand all | Expand 10 after
5354 'variables': { 5358 'variables': {
5355 'proto_in_dir': '../third_party/cros_system_api/dbus/', 5359 'proto_in_dir': '../third_party/cros_system_api/dbus/',
5356 'proto_out_dir': 'chrome/browser/chromeos/dbus', 5360 'proto_out_dir': 'chrome/browser/chromeos/dbus',
5357 }, 5361 },
5358 'includes': ['../build/protoc.gypi'], 5362 'includes': ['../build/protoc.gypi'],
5359 }], 5363 }],
5360 ], 5364 ],
5361 }, 5365 },
5362 ], 5366 ],
5363 } 5367 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options2/options_ui2.cc ('k') | ui/resources/ui_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698