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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 3532010: Add a pref checkbox to enable/disable screen lock for ChromeOs. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: firx chromeos trybot 2, set expectations Created 10 years, 2 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/browser/resources/options/personal_options.js ('k') | chrome/common/pref_names.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) 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 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 'browser/chromeos/cros/update_library.cc', 429 'browser/chromeos/cros/update_library.cc',
430 'browser/chromeos/cros/update_library.h', 430 'browser/chromeos/cros/update_library.h',
431 'browser/chromeos/customization_document.cc', 431 'browser/chromeos/customization_document.cc',
432 'browser/chromeos/customization_document.h', 432 'browser/chromeos/customization_document.h',
433 'browser/chromeos/dom_ui/accounts_options_handler.cc', 433 'browser/chromeos/dom_ui/accounts_options_handler.cc',
434 'browser/chromeos/dom_ui/accounts_options_handler.h', 434 'browser/chromeos/dom_ui/accounts_options_handler.h',
435 'browser/chromeos/dom_ui/core_chromeos_options_handler.cc', 435 'browser/chromeos/dom_ui/core_chromeos_options_handler.cc',
436 'browser/chromeos/dom_ui/core_chromeos_options_handler.h', 436 'browser/chromeos/dom_ui/core_chromeos_options_handler.h',
437 'browser/chromeos/dom_ui/cros_options_page_ui_handler.cc', 437 'browser/chromeos/dom_ui/cros_options_page_ui_handler.cc',
438 'browser/chromeos/dom_ui/cros_options_page_ui_handler.h', 438 'browser/chromeos/dom_ui/cros_options_page_ui_handler.h',
439 'browser/chromeos/dom_ui/cros_personal_options_handler.cc',
440 'browser/chromeos/dom_ui/cros_personal_options_handler.h',
439 'browser/chromeos/dom_ui/imageburner_ui.cc', 441 'browser/chromeos/dom_ui/imageburner_ui.cc',
440 'browser/chromeos/dom_ui/imageburner_ui.h', 442 'browser/chromeos/dom_ui/imageburner_ui.h',
441 'browser/chromeos/dom_ui/internet_options_handler.cc', 443 'browser/chromeos/dom_ui/internet_options_handler.cc',
442 'browser/chromeos/dom_ui/internet_options_handler.h', 444 'browser/chromeos/dom_ui/internet_options_handler.h',
443 'browser/chromeos/dom_ui/labs_handler.cc', 445 'browser/chromeos/dom_ui/labs_handler.cc',
444 'browser/chromeos/dom_ui/labs_handler.h', 446 'browser/chromeos/dom_ui/labs_handler.h',
445 'browser/chromeos/dom_ui/language_chewing_options_handler.cc', 447 'browser/chromeos/dom_ui/language_chewing_options_handler.cc',
446 'browser/chromeos/dom_ui/language_chewing_options_handler.h', 448 'browser/chromeos/dom_ui/language_chewing_options_handler.h',
447 'browser/chromeos/dom_ui/language_customize_modifier_keys_handler.cc', 449 'browser/chromeos/dom_ui/language_customize_modifier_keys_handler.cc',
448 'browser/chromeos/dom_ui/language_customize_modifier_keys_handler.h', 450 'browser/chromeos/dom_ui/language_customize_modifier_keys_handler.h',
(...skipping 2831 matching lines...) Expand 10 before | Expand all | Expand 10 after
3280 'browser/password_manager/native_backend_gnome_x.cc', 3282 'browser/password_manager/native_backend_gnome_x.cc',
3281 ], 3283 ],
3282 }], 3284 }],
3283 ['touchui==0', { 3285 ['touchui==0', {
3284 'sources!': [ 3286 'sources!': [
3285 'browser/dom_ui/keyboard_ui.cc', 3287 'browser/dom_ui/keyboard_ui.cc',
3286 'browser/dom_ui/keyboard_ui.h', 3288 'browser/dom_ui/keyboard_ui.h',
3287 ], 3289 ],
3288 }], 3290 }],
3289 ['touchui==1', { 3291 ['touchui==1', {
3290 » 'sources/': [ 3292 'sources/': [
3291 » ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'] , 3293 ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'] ,
3292 » ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'], 3294 ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'],
3293 » ], 3295 ],
3294 }], 3296 }],
3295 ['OS=="linux"', { 3297 ['OS=="linux"', {
3296 'dependencies': [ 3298 'dependencies': [
3297 '../build/linux/system.gyp:dbus-glib', 3299 '../build/linux/system.gyp:dbus-glib',
3298 '../build/linux/system.gyp:gconf', 3300 '../build/linux/system.gyp:gconf',
3299 '../build/linux/system.gyp:gtk', 3301 '../build/linux/system.gyp:gtk',
3300 '../build/linux/system.gyp:gtkprint', 3302 '../build/linux/system.gyp:gtkprint',
3301 '../build/linux/system.gyp:nss', 3303 '../build/linux/system.gyp:nss',
3302 '../third_party/undoview/undoview.gyp:undoview', 3304 '../third_party/undoview/undoview.gyp:undoview',
3303 ], 3305 ],
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
3550 'browser/net/ssl_config_service_manager_system.cc', 3552 'browser/net/ssl_config_service_manager_system.cc',
3551 # Using built-in rule in vstudio for midl. 3553 # Using built-in rule in vstudio for midl.
3552 'browser/history/history_indexer.idl', 3554 'browser/history/history_indexer.idl',
3553 ], 3555 ],
3554 'sources!': [ 3556 'sources!': [
3555 'browser/browser_list_stub.cc', 3557 'browser/browser_list_stub.cc',
3556 'browser/history/history_publisher_none.cc', 3558 'browser/history/history_publisher_none.cc',
3557 'browser/importer/nss_decryptor_system_nss.cc', 3559 'browser/importer/nss_decryptor_system_nss.cc',
3558 'browser/importer/nss_decryptor_system_nss.h', 3560 'browser/importer/nss_decryptor_system_nss.h',
3559 'browser/power_save_blocker_stub.cc', 3561 'browser/power_save_blocker_stub.cc',
3560 » 'browser/renderer_host/render_widget_host_view_views.cc', 3562 'browser/renderer_host/render_widget_host_view_views.cc',
3561 » 'browser/renderer_host/render_widget_host_view_views.h', 3563 'browser/renderer_host/render_widget_host_view_views.h',
3562 'browser/views/select_file_dialog.cc', 3564 'browser/views/select_file_dialog.cc',
3563 ], 3565 ],
3564 'conditions': [ 3566 'conditions': [
3565 ['win_use_allocator_shim==1', { 3567 ['win_use_allocator_shim==1', {
3566 'dependencies': [ 3568 'dependencies': [
3567 '<(allocator_target)', 3569 '<(allocator_target)',
3568 ], 3570 ],
3569 }], 3571 }],
3570 ], 3572 ],
3571 }, { # 'OS!="win" 3573 }, { # 'OS!="win"
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
4131 ], 4133 ],
4132 }, 4134 },
4133 ], 4135 ],
4134 } 4136 }
4135 4137
4136 # Local Variables: 4138 # Local Variables:
4137 # tab-width:2 4139 # tab-width:2
4138 # indent-tabs-mode:nil 4140 # indent-tabs-mode:nil
4139 # End: 4141 # End:
4140 # vim: set expandtab tabstop=2 shiftwidth=2: 4142 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/personal_options.js ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698