diff options
| author | cmasone@google.com <cmasone@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-21 01:47:41 +0000 |
|---|---|---|
| committer | cmasone@google.com <cmasone@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-21 01:47:41 +0000 |
| commit | 2125f7df5af31857e7698264ed42e616d8271b63 (patch) | |
| tree | 93fedc0c6d069653152d55acb8d30deaac3fe52d /chrome/chrome.gyp | |
| parent | e4dffe1f0817173ac6ef403b0350d8b5e1743f6d (diff) | |
| download | chromium_src-2125f7df5af31857e7698264ed42e616d8271b63.zip chromium_src-2125f7df5af31857e7698264ed42e616d8271b63.tar.gz chromium_src-2125f7df5af31857e7698264ed42e616d8271b63.tar.bz2 | |
[Chrome OS] Adds support for injecting Corp cookies at startup
To support single-sign-on for Chrome OS, we need a way to inject cookies into Chrome. In the case of session cookies, putting them into Chrome's cookie jar DB doesn't work. This CL adds a command line flag that tells chrome the name of a Unix pipe to open, from which it can read said cookies.
Eventually, I want to replace this pipe-reading with an appropriate usage of DBus, but Chrome OS isn't there yet. This CL adds the appropriate infrastructure, though, and the PipeReader class can later be replaced with something that pulls the cookies off DBus instead.
Review URL: http://codereview.chromium.org/174062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 49f8fa5..02ef7ef 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -63,13 +63,13 @@ # TODO(jcampan): move these vars to views.gyp. 'views_unit_tests_sources': [ '../views/view_unittest.cc', - '../views/focus/focus_manager_unittest.cc', ], 'views_unit_tests_sources_win_specific': [ # TODO(jcampan): make the following tests work on Linux. '../views/controls/label_unittest.cc', '../views/controls/table/table_view_unittest.cc', '../views/grid_layout_unittest.cc', + '../views/focus/focus_manager_unittest.cc', ], 'conditions': [ ['OS=="mac"', { @@ -791,6 +791,10 @@ 'browser/chrome_plugin_host.h', 'browser/chrome_thread.cc', 'browser/chrome_thread.h', + 'browser/chromeos/pipe_reader.cc', + 'browser/chromeos/pipe_reader.h', + 'browser/chromeos/external_cookie_handler.cc', + 'browser/chromeos/external_cookie_handler.h', 'browser/cocoa/about_window_controller.h', 'browser/cocoa/about_window_controller.mm', 'browser/cocoa/autocomplete_text_field.h', @@ -2060,6 +2064,14 @@ 'CHROME_V8', ], }], + ['chromeos==0', { + 'sources!': [ + 'browser/chromeos/pipe_reader.cc', + 'browser/chromeos/pipe_reader.h', + 'browser/chromeos/external_cookie_handler.cc', + 'browser/chromeos/external_cookie_handler.h', + ], + }], ['OS=="linux"', { 'dependencies': [ # Temporarily disabled while we figure some stuff out. @@ -3811,6 +3823,8 @@ 'browser/debugger/devtools_remote_listen_socket_unittest.h', 'browser/child_process_security_policy_unittest.cc', 'browser/chrome_thread_unittest.cc', + 'browser/chromeos/pipe_reader_unittest.cc', + 'browser/chromeos/external_cookie_handler_unittest.cc', # It is safe to list */cocoa/* files in the "common" file list # without an explicit exclusion since gyp is smart enough to # exclude them from non-Mac builds. @@ -4041,6 +4055,12 @@ 'tools/build/win/precompiled_wtl.cc', ], 'conditions': [ + ['chromeos==0', { + 'sources!': [ + 'browser/chromeos/pipe_reader_unittest.cc', + 'browser/chromeos/external_cookie_handler_unittest.cc', + ], + }], ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', |