diff options
| author | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-10 03:16:31 +0000 |
|---|---|---|
| committer | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-10 03:16:31 +0000 |
| commit | b6a040a170be44d208a5ab379931c571232dd3e2 (patch) | |
| tree | b417055b805b6ad2358342008754e4f5d05976b1 /chrome_frame/test/http_server.cc | |
| parent | 2cdaa8386a9236316f80281e8b5c0023d1ce83ad (diff) | |
| download | chromium_src-b6a040a170be44d208a5ab379931c571232dd3e2.zip chromium_src-b6a040a170be44d208a5ab379931c571232dd3e2.tar.gz chromium_src-b6a040a170be44d208a5ab379931c571232dd3e2.tar.bz2 | |
Updates CFInstall.js to:
* provide a new 'overlay' prompt mode that includes a "close" button with a cookie that respects the user preference for any originating site
* handle requesting the install UI from a host page loaded from a file:// URL
* expands UA detection to stop taunting Win2K (and below) users with visions of WebKit goodness
* preserves full compat with previous version
BUG=23057,22738,23132
TEST=see new test files in this change or build chrome_frame_tests and run with: chrome_frame_tests.exe --gtest_filter=*CFInstall*
Review URL: http://codereview.chromium.org/345032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31539 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/http_server.cc')
| -rw-r--r-- | chrome_frame/test/http_server.cc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/chrome_frame/test/http_server.cc b/chrome_frame/test/http_server.cc index f2cc333..d8223f2 100644 --- a/chrome_frame/test/http_server.cc +++ b/chrome_frame/test/http_server.cc @@ -20,6 +20,12 @@ void ChromeFrameHTTPServer::SetUp() { FILE_PATH_LITERAL("test")).Append( FILE_PATH_LITERAL("data")).Append( FILE_PATH_LITERAL("CFInstance.js"))); // NOLINT + + file_util::CopyFile(cf_source_path.Append(FILE_PATH_LITERAL("CFInstall.js")), + cf_source_path.Append( + FILE_PATH_LITERAL("test")).Append( + FILE_PATH_LITERAL("data")).Append( + FILE_PATH_LITERAL("CFInstall.js"))); // NOLINT } void ChromeFrameHTTPServer::TearDown() { @@ -37,6 +43,16 @@ void ChromeFrameHTTPServer::TearDown() { .Append(FILE_PATH_LITERAL("CFInstance.js")); file_util::Delete(cfi_path, false); + + cfi_path.empty(); + PathService::Get(base::DIR_SOURCE_ROOT, &cfi_path); + cfi_path = cfi_path + .Append(FILE_PATH_LITERAL("chrome_frame")) + .Append(FILE_PATH_LITERAL("test")) + .Append(FILE_PATH_LITERAL("data")) + .Append(FILE_PATH_LITERAL("CFInstall.js")); + + file_util::Delete(cfi_path, false); } bool ChromeFrameHTTPServer::WaitToFinish(int milliseconds) { |