diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 20:21:53 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 20:21:53 +0000 |
commit | 2627431bef905332e55a90960aed8049b681689f (patch) | |
tree | 4d15c42eb95a48241e2bc9a109bbb77c3eafad00 /chrome/chrome.gyp | |
parent | d328413b739ed1150369743a64cacfb167086a32 (diff) | |
download | chromium_src-2627431bef905332e55a90960aed8049b681689f.zip chromium_src-2627431bef905332e55a90960aed8049b681689f.tar.gz chromium_src-2627431bef905332e55a90960aed8049b681689f.tar.bz2 |
Lands http://codereview.chromium.org/193032 for Charlie:
First pass at adding ChromeOS settings
- a mock wifi selector combobox
- touchpad settings that makes calls to synclient
- on startup, touchpad settings are initialized to what's stored in
preferences
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/203073
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r-- | chrome/chrome.gyp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index c45a581..bf939fb 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -861,12 +861,16 @@ 'browser/chromeos/pipe_reader.h', 'browser/chromeos/external_cookie_handler.cc', 'browser/chromeos/external_cookie_handler.h', - 'browser/chromeos/gview_request_interceptor.cc', - 'browser/chromeos/gview_request_interceptor.h', + 'browser/chromeos/gview_request_interceptor.cc', + 'browser/chromeos/gview_request_interceptor.h', + 'browser/chromeos/settings_contents_view.cc', + 'browser/chromeos/settings_contents_view.h', 'browser/chromeos/settings_page_view.cc', 'browser/chromeos/settings_page_view.h', 'browser/chromeos/status_area_view.cc', 'browser/chromeos/status_area_view.h', + 'browser/chromeos/touchpad.cc', + 'browser/chromeos/touchpad.h', 'browser/cocoa/about_window_controller.h', 'browser/cocoa/about_window_controller.mm', 'browser/cocoa/autocomplete_text_field.h', |