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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 3ccef48b15f9afff1aaf5377a373b54f4f8f15c1..52d67f06d9c00a8e1dba12c5e96e5f6c82622491 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -436,6 +436,8 @@
'browser/chromeos/dom_ui/core_chromeos_options_handler.h',
'browser/chromeos/dom_ui/cros_options_page_ui_handler.cc',
'browser/chromeos/dom_ui/cros_options_page_ui_handler.h',
+ 'browser/chromeos/dom_ui/cros_personal_options_handler.cc',
+ 'browser/chromeos/dom_ui/cros_personal_options_handler.h',
'browser/chromeos/dom_ui/imageburner_ui.cc',
'browser/chromeos/dom_ui/imageburner_ui.h',
'browser/chromeos/dom_ui/internet_options_handler.cc',
@@ -3287,10 +3289,10 @@
],
}],
['touchui==1', {
- 'sources/': [
- ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'],
- ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'],
- ],
+ 'sources/': [
+ ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'],
+ ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'],
+ ],
}],
['OS=="linux"', {
'dependencies': [
@@ -3557,8 +3559,8 @@
'browser/importer/nss_decryptor_system_nss.cc',
'browser/importer/nss_decryptor_system_nss.h',
'browser/power_save_blocker_stub.cc',
- 'browser/renderer_host/render_widget_host_view_views.cc',
- 'browser/renderer_host/render_widget_host_view_views.h',
+ 'browser/renderer_host/render_widget_host_view_views.cc',
+ 'browser/renderer_host/render_widget_host_view_views.h',
'browser/views/select_file_dialog.cc',
],
'conditions': [
« 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