summaryrefslogtreecommitdiffstats
path: root/chrome_frame
Commit message (Collapse)AuthorAgeFilesLines
* Add support for the DELETE method.tommi@chromium.org2010-06-041-1/+2
| | | | | | | | | TEST=See bug description. BUG=45384 Review URL: http://codereview.chromium.org/2675001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48934 0039d316-1c4b-4281-b951-d872f2087c98
* Navigating to a page in ChromeFrame in IE would display the sad tab page ↵ananta@chromium.org2010-06-036-11/+25
| | | | | | | | | | | | | | | briefly until the navigation was initiated from IE. We have code in the ChromeFrame external tab container to initiate the navigation during initialization if we have a valid url passed in while creating the external tab. The URL would not get passed down even though it was available from ChromeFrame. This fixes bug http://code.google.com/p/chromium/issues/detail?id=43482 Bug=43482 Review URL: http://codereview.chromium.org/2600002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48890 0039d316-1c4b-4281-b951-d872f2087c98
* Ensures that cold startup perf tests clear more DLLs. Helps bring results ↵slightlyoff@chromium.org2010-06-031-2/+14
| | | | | | | | | | | into line with worst-case expectations on Vista. BUG=None TeST=run GCF perftests Review URL: http://codereview.chromium.org/2544003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48799 0039d316-1c4b-4281-b951-d872f2087c98
* Rework the logging for sockets/connectjobs.eroman@chromium.org2010-06-031-1/+2
| | | | | | | | | | | | | | | | | | In particular, make it work better when using backup jobs / late binding (the display was very confused before because of how these asynchronous events would nest). Also changed the paradigm for how PassiveLogCollector preserves these async associations -- this fixes how it replays the events to net-internals. (Before we would collapse the event streams into the SOURCE_URL_REQUEST which lost some hiearchy.. now I keep the separate streams). Some of the particular changes to the event streams: * ConnectJobs now create their own source stream internally. * Sockets are now bounded by +SOCKET_ALIVE / -SOCKET_ALIVE events (removed the one-off SOCKET_DONE event). * The socket log streams contains +SOCKET_IN_USE / -SOCKET_IN_USE event blocks to show which URLRequest was controlling it at various points in time (this makes it much easier to understand which read/writes belonged to a particular network transaction when a socket gets re-used). * ConnectJobs are bounded by +SOCKET_POOL_CONNECT_JOB / - SOCKET_POOL_CONNECT_JOB events. * ConnectJobs log the net error they failed with. * Removed the SOCKET_BACKUP_TIMER_EXTENDED event. Review URL: http://codereview.chromium.org/2363003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48797 0039d316-1c4b-4281-b951-d872f2087c98
* Add chrome_frame_tests to check that some navigation cases are not broken in IE.kkania@chromium.org2010-06-0210-55/+229
| | | | | | | | | BUG=none TEST=none Original review URL: http://codereview.chromium.org/2173002 Review URL: http://codereview.chromium.org/2375003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48763 0039d316-1c4b-4281-b951-d872f2087c98
* Misc. small cleanups I ran into while working on other changes.pkasting@chromium.org2010-06-021-0/+2
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/2486004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48730 0039d316-1c4b-4281-b951-d872f2087c98
* Add version information to chrome_launcher.exe.robertshield@chromium.org2010-06-022-1/+61
| | | | | | | | | BUG=35036 TEST=Check chrome_launcher.exe properties, check that it has version information. Review URL: http://codereview.chromium.org/2497001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48724 0039d316-1c4b-4281-b951-d872f2087c98
* Implement most of the ridealong fixes/cleanups I suggested during review for ↵pkasting@chromium.org2010-06-014-109/+63
| | | | | | | | | | enabling warn-on-signed-versus-unsigned-equality-comparisions on Windows. BUG=none TEST=none Review URL: http://codereview.chromium.org/2395001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48666 0039d316-1c4b-4281-b951-d872f2087c98
* Use arraysize() instead of ARRAYSIZE_UNSAFE() where possible. Remove ↵pkasting@chromium.org2010-06-011-2/+0
| | | | | | | | | | pointless comment about use of ARRAYSIZE_UNSAFE(). BUG=none TEST=none Review URL: http://codereview.chromium.org/2364003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48663 0039d316-1c4b-4281-b951-d872f2087c98
* Avoid calling CreateWindow while checking for previous instances of Chrome ↵robertshield@chromium.org2010-05-311-38/+8
| | | | | | | | | | | Frame. (Stuff the data in the lpfnWndProc member of the WNDCLASSEX structure instead). BUG=none TEST=none Review URL: http://codereview.chromium.org/2272002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48609 0039d316-1c4b-4281-b951-d872f2087c98
* Simplify Chrome Frame usage of Chrome identifiers by simply using the Chrome ↵pkasting@chromium.org2010-05-288-43/+17
| | | | | | | | | | identifiers directly. This required renaming a few identifiers to avoid macro renaming conflicts when including the Chrome headers. BUG=none TEST=none Review URL: http://codereview.chromium.org/2359002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48543 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 48527 - Add chrome frame tests for common navigation cases to ensure ↵kkania@chromium.org2010-05-2810-232/+55
| | | | | | | | | | | | | IE still works. BUG=none TEST=none Review url: http://codereview.chromium.org/2173002 Review URL: http://codereview.chromium.org/2374002 TBR=kkania@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48529 0039d316-1c4b-4281-b951-d872f2087c98
* Add chrome frame tests for common navigation cases to ensure IE still works.kkania@chromium.org2010-05-2810-55/+232
| | | | | | | | | BUG=none TEST=none Review url: http://codereview.chromium.org/2173002 Review URL: http://codereview.chromium.org/2374002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48527 0039d316-1c4b-4281-b951-d872f2087c98
* Correct line endings in chrome_frame_launcher.gyp.robertshield@chromium.org2010-05-281-84/+84
| | | | | | | | | | | BUG=none TEST=gyp works on cygwin on windows TBR=xiyuan Review URL: http://codereview.chromium.org/2379002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48525 0039d316-1c4b-4281-b951-d872f2087c98
* Rewrite of chrome_launcher.exe. ETW-based perf tests suggest that this is on ↵robertshield@chromium.org2010-05-2811-261/+516
| | | | | | | | average about 50% faster than the previous version. Review URL: http://codereview.chromium.org/2278003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48500 0039d316-1c4b-4281-b951-d872f2087c98
* Enable warning 4389 as an error on windows builds. This will make mbelshe@chromium.org2010-05-2711-35/+36
| | | | | | | | | | | | windows builds more similar to linux/mac, which already treat signed/ unsigned equality comparisons as warnings (and hence errors). BUG=44471 TEST=none Review URL: http://codereview.chromium.org/2222002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48395 0039d316-1c4b-4281-b951-d872f2087c98
* chrome_frame: Remove several instances of the deprecated wstrings functionstfarina@chromium.org2010-05-276-42/+43
| | | | | | | | | | | and use their FilePath equivalents. BUG=24874 TEST=included Review URL: http://codereview.chromium.org/2125021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48376 0039d316-1c4b-4281-b951-d872f2087c98
* Add a call to SetLastError before calling SetClassLongPtr. It turns out that ↵robertshield@chromium.org2010-05-261-0/+2
| | | | | | | | | | | | SetClasSLongPtr doesn't reset the error code on success and yet said code must be used to check for failure. BUG=45041 TEST=none Review URL: http://codereview.chromium.org/2229003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48277 0039d316-1c4b-4281-b951-d872f2087c98
* In ChromeFrame there are cases when the ↵ananta@chromium.org2010-05-261-5/+7
| | | | | | | | | | | ChromeFrameAutomationProxy::SendAsAsync function can be passed a NULL callback. The dispatcher needs to check for the same and ignore the returned callback message. We currently crash on trunk. Review URL: http://codereview.chromium.org/2227001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48256 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Another dependency the bbot missed!!!"rafaelw@chromium.org2010-05-2611-37/+36
| | | | | | | | | | | | | | | | | | This reverts commit 161f7fd3bdd425167af9fe26fdc5373a2ff44c98. Revert "Missed a file as part of checkin for r48186" This reverts commit cff86beba5938209393a6c3bccced62a7f3ff36b. Revert "Enable warning 4389 as an error on windows builds. This will make" This reverts commit c78936bcfc65b98edf288191d927a495b0364621. TBR=mbelshe Review URL: http://codereview.chromium.org/2253001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48238 0039d316-1c4b-4281-b951-d872f2087c98
* Enabling the ChromeFrame unload event test which validates that unload ↵ananta@chromium.org2010-05-253-6/+4
| | | | | | | | | | | | | | | handlers on the page are invoked correctly. To flag success or failure we now set the state in the localStorage object instead of setting this via cookies as the cookies are set in IE on the UI thread causing this test to fail. Fixes bug http://code.google.com/p/chromium/issues/detail?id=40814 Bug=40814 Review URL: http://codereview.chromium.org/2215001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48218 0039d316-1c4b-4281-b951-d872f2087c98
* Enable warning 4389 as an error on windows builds. This will makembelshe@chromium.org2010-05-2511-36/+37
| | | | | | | | | | | | windows builds more similar to linux/mac, which already treat signed/ unsigned equality comparisons as warnings (and hence errors). BUG=44471 TEST=none Review URL: http://codereview.chromium.org/2081007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48186 0039d316-1c4b-4281-b951-d872f2087c98
* Another try at correcting VTable pointer checkamit@chromium.org2010-05-251-1/+1
| | | | | | | | | BUG==25457 Review URL: http://codereview.chromium.org/2152004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48177 0039d316-1c4b-4281-b951-d872f2087c98
* Tear off windows opened in ChromeFrame in IE6 would result in the new window ↵ananta@chromium.org2010-05-251-1/+0
| | | | | | | | | | | | | | | | | being minimized by default. This was because of a call to IWebBrowser2::put_visible after initiating the navigation. The put_visible call eventually calls SetForegroundWindow setting focus back to the current document thus causing focus to switch away from the new window. Fix is to remove call to put_visible. Fixes bug http://b/issue?id=2692416 Bug=2692416 Review URL: http://codereview.chromium.org/2153006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48167 0039d316-1c4b-4281-b951-d872f2087c98
* Break gyp cycles on Linux.tony@chromium.org2010-05-241-9/+8
| | | | | | | | | | The cycle is between installer.gyp and chrome.gyp. The fix is to switch installer.gyp into installer.gypi and include it into chrome.gyp BUG=35308 Review URL: http://codereview.chromium.org/2067018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48007 0039d316-1c4b-4281-b951-d872f2087c98
* In ChromeFrame in the IInternetProtocolRoot::ReportProgress patch use the ↵ananta@chromium.org2010-05-212-19/+15
| | | | | | | | | | | | | | | | | | | exception barrier version which only reports crashes in ChromeFrame while calling the original function. We also use the other version of the ExceptionBarrier when we switch the mime type from text/html. This is to prevent the vectored exception handler from handling this exception and reporting a false positive if any stack based exception handler actually handles this exception. The other change is to remove the IHttpNegotiate::OnResponse patch as it did not do anything useful and some crashes were being reported while invoking the original function. Fixes bugs http://code.google.com/p/chromium/issues/detail?id=44767 and http://code.google.com/p/chromium/issues/detail?id=44765 Bug=44767,44765 Review URL: http://codereview.chromium.org/2078030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47957 0039d316-1c4b-4281-b951-d872f2087c98
* Removed dependency on ChromeThread from JsonPrefStore and moved ↵sanjeevr@chromium.org2010-05-211-2/+6
| | | | | | | | | | | JsonPrefStore and PrefStore to chrome/common. This is because JsonPrefStore is needed in the service process BUG=None. TEST=Updated unit-tests Review URL: http://codereview.chromium.org/2066015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47915 0039d316-1c4b-4281-b951-d872f2087c98
* Initialize the ChromeFrame request manager with the container interface in ↵ananta@chromium.org2010-05-211-1/+2
| | | | | | | | | | | | the constructor instead of FinalConstruct as there are codepaths in which the base FinalConstruct is not called. Bug=44465 Review URL: http://codereview.chromium.org/2093011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47890 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a ChromeFrame crash caused when the cookie policy is set to prompt and ↵ananta@chromium.org2010-05-204-6/+25
| | | | | | | | | | | | | | | | | | | | | the active document is released before the prompt is clicked on. This only happens on IE6 where the prompt dialog is modeless in the context of the InternetSetCookieEx call. To ensure that the active document remains valid for the duration of the call we maintain a reference on the container for the duration of the InternetSetCookie call. The cookie calls in IE are now handled on the UI thread as we cannot block the IPC thread in case the set cookie calls result in a prompt. This fixes bug http://code.google.com/p/chromium/issues/detail?id=44465 The FullTabModeIE_UnloadEventTest has been disabled as the change to execute the cookie calls on the UI thread would break it. Bug=44465, 40814 Review URL: http://codereview.chromium.org/2091015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47846 0039d316-1c4b-4281-b951-d872f2087c98
* Check the container for NULLness before dereferencing.tommi@chromium.org2010-05-201-3/+5
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/2117021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47826 0039d316-1c4b-4281-b951-d872f2087c98
* Avoid wrapping callbacks for network requests not coming from MSHTML.stoyan@chromium.org2010-05-201-0/+19
| | | | | | | | | This is a tentative fix, since I was unable to reproduce crash in AcroPDF.dll Review URL: http://codereview.chromium.org/2087017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47813 0039d316-1c4b-4281-b951-d872f2087c98
* Check correct offset to avoid crashamit@chromium.org2010-05-191-2/+3
| | | | | | | | | | | | This change corrects the offset and the condition to avoid crash in IBrowserService2::v_MayTranslateAccelerator. BUG=25457 Review URL: http://codereview.chromium.org/2109010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47744 0039d316-1c4b-4281-b951-d872f2087c98
* Fix false positive reporting of exceptions picked up during calls to ↵robertshield@chromium.org2010-05-191-0/+8
| | | | | | | | | | | LoadLibrary during DllRegisterServer. BUG=44468 Review URL: http://codereview.chromium.org/2089016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47696 0039d316-1c4b-4281-b951-d872f2087c98
* Addressing review comment from Stoyan (remove one dlog statement).tommi@chromium.org2010-05-191-3/+0
| | | | | | | | | | TEST=none BUG=none TBR=stoyan Review URL: http://codereview.chromium.org/2102010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47691 0039d316-1c4b-4281-b951-d872f2087c98
* Adding a bit of logging to track down the reason for recent ↵tommi@chromium.org2010-05-191-9/+19
| | | | | | | | | | | | "LaunchBrowser(browser, page)" failures on the build bots. TEST=n/a BUG=none Review URL: http://codereview.chromium.org/2099005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47690 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the ChromeFrame MockCreateTabOk test by returning the launch result from ↵ananta@chromium.org2010-05-193-8/+12
| | | | | | | | | | | | | | the CreateExternalTabComplete helper and passing the same to the InitializeComplete function which eventually gets passed down to the mock delegate which expects a failure. Bug=44245 TBR=stoyan Review URL: http://codereview.chromium.org/2114009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47617 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the ChromeFrame new window popup test by ensuring that ↵ananta@chromium.org2010-05-193-13/+12
| | | | | | | | | | | | | | | | | CreateExternalTabComplete executes on the IPC thread as before and InitializeComplete executes as a task on the UI thread. The test failed because we receive IPCs for the new tab before we have a tab proxy for it. To fix the crash in bug http://code.google.com/p/chromium/issues/detail?id=44245, we set the automation_server_ member to NULL after ReleaseAutomationServer returns. There are a number of races related to the automation server being released which should hopefully go away if we remove dependency on the AutomationProxy object. Added a TODO to that effect in the code. Bug=44245 Review URL: http://codereview.chromium.org/2079012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47612 0039d316-1c4b-4281-b951-d872f2087c98
* Rename "mixed content" to "insecure content" in as many places as possible, ↵pkasting@chromium.org2010-05-182-8/+8
| | | | | | | | | | to standardize on a consistent naming scheme. BUG=none TEST=none Review URL: http://codereview.chromium.org/2069005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47531 0039d316-1c4b-4281-b951-d872f2087c98
* Relanding this fix with the fixes to get chrome frame tests to pass.ananta@chromium.org2010-05-188-153/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | In ChromeFrame the ChromeFrameAutomationProxy object is created on the background proxy channel thread and is accessed from the UI thread, the proxy channel thread and the IPC thread. This leads to a race condition when ChromeFrame is being torn down which occurs because the ChromeFrameAutomationProxy pointer is being set to NULL in the UI thread/deleted in the proxy background thread while it could be accessed while processing a callback in the IPC thread thus causing a crash. Fix is to ensure that the IPC thread does not access the ChromeFrameAutomationProxy pointer. To achieve this the callbacks are now individual context objects which when invoked forward the actions to the ChromeFrameAutomationClient object. The CreateExternalTab and ConnectExternalTab callbacks now complete their actions on the UI thread. While at this based on a discussion and lot of help from Stoyan we decided to clean up the sync message dispatching code used by ChromeFrame by having callbacks now derive from a SyncMessageCallContext class to ensure that these get cleaned up correctly in all cases. For e.g. if we don't receive a response for a message, etc and thus enable them to present a consistent interface to be invoked when we receive a response for a IPc message. Fixes bug http://code.google.com/p/chromium/issues/detail?id=44245 Bug=44245 TBR=stoyan Review URL: http://codereview.chromium.org/2119004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47494 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 47453 - In ChromeFrame the ChromeFrameAutomationProxy object is ↵ananta@chromium.org2010-05-175-219/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | created on the background proxy channel thread and is accessed from the UI thread, the proxy channel thread and the IPC thread. This leads to a race condition when ChromeFrame is being torn down which occurs because the ChromeFrameAutomationProxy pointer is being set to NULL in the UI thread/deleted in the proxy background thread while it could be accessed while processing a callback in the IPC thread thus causing a crash. Fix is to ensure that the IPC thread does not access the ChromeFrameAutomationProxy pointer. To achieve this the callbacks are now individual context objects which when invoked forward the actions to the ChromeFrameAutomationClient object. The CreateExternalTab and ConnectExternalTab callbacks now complete their actions on the UI thread. While at this based on a discussion and lot of help from Stoyan we decided to clean up the sync message dispatching code used by ChromeFrame by having callbacks now derive from a SyncMessageCallContext class to ensure that these get cleaned up correctly in all cases. For e.g. if we don't receive a response for a message, etc and thus enable them to present a consistent interface to be invoked when we receive a response for a IPc message. Fixes bug http://code.google.com/p/chromium/issues/detail?id=44245 Bug=44245 Review URL: http://codereview.chromium.org/2073007 TBR=ananta@chromium.org Review URL: http://codereview.chromium.org/2110006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47461 0039d316-1c4b-4281-b951-d872f2087c98
* In ChromeFrame the ChromeFrameAutomationProxy object is created on the ↵ananta@chromium.org2010-05-175-145/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | background proxy channel thread and is accessed from the UI thread, the proxy channel thread and the IPC thread. This leads to a race condition when ChromeFrame is being torn down which occurs because the ChromeFrameAutomationProxy pointer is being set to NULL in the UI thread/deleted in the proxy background thread while it could be accessed while processing a callback in the IPC thread thus causing a crash. Fix is to ensure that the IPC thread does not access the ChromeFrameAutomationProxy pointer. To achieve this the callbacks are now individual context objects which when invoked forward the actions to the ChromeFrameAutomationClient object. The CreateExternalTab and ConnectExternalTab callbacks now complete their actions on the UI thread. While at this based on a discussion and lot of help from Stoyan we decided to clean up the sync message dispatching code used by ChromeFrame by having callbacks now derive from a SyncMessageCallContext class to ensure that these get cleaned up correctly in all cases. For e.g. if we don't receive a response for a message, etc and thus enable them to present a consistent interface to be invoked when we receive a response for a IPc message. Fixes bug http://code.google.com/p/chromium/issues/detail?id=44245 Bug=44245 Review URL: http://codereview.chromium.org/2073007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47453 0039d316-1c4b-4281-b951-d872f2087c98
* Reland r47347 [was reverted in r47357], this time without re-enabling a ↵pkasting@chromium.org2010-05-171-4/+6
| | | | | | | | | | | | | | | | | | | | | DISABLED test that times out on Mac. (Original patch reviewed at http://codereview.chromium.org/2067003 ) Track "display" and "run" separately for mixed content, and make the latter downgrade the SSL state to "authentication broken". Make the "display" state only affect the current tab (not the entire host). Fix an SSL browser test by supplying the appropriate SiteInstance*. Move a test from "disabled" to "flaky" since it at least passes for me. Make the SSLManager header and .cc files put functions in the same order, and make that order somewhat saner. BUG=15072, 18626, 40932, 42758 TEST=Covered by browser tests Review URL: http://codereview.chromium.org/2063008 Review URL: http://codereview.chromium.org/2126005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47428 0039d316-1c4b-4281-b951-d872f2087c98
* Perform breakpad shutdown when returning from the chrome launcher entry ↵robertshield@chromium.org2010-05-172-5/+12
| | | | | | | | | | | point. This is a to avoid the deadlock that occurs when shutting it down in DllMain in chrome_launcher.exe. BUG=44212 TEST=chrome_launcher.exe stops hanging Review URL: http://codereview.chromium.org/2094006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47422 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 47347 - (Original patch reviewed at ↵rvargas@google.com2010-05-151-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://codereview.chromium.org/2067003 ) Track "display" and "run" separately for mixed content, and make the latter downgrade the SSL state to "authentication broken". Make the "display" state only affect the current tab (not the entire host). Fix an SSL browser test by supplying the appropriate SiteInstance*. Move a test from "disabled" to "flaky" since it at least passes for me. Make the SSLManager header and .cc files put functions in the same order, and make that order somewhat saner. Falied TestGoodFrameNavigation on Mac 10.5 browser tests among other things: /b/slave/chromium-rel-mac-builder/build/src/chrome/browser/ssl/ssl_browser_tests.cc:43: Failure Value of: entry->ssl().displayed_mixed_content() Actual: false Expected: displayed_mixed_content Which is: true BUG=15072, 18626, 40932, 42758 TEST=Covered by browser tests Review URL: http://codereview.chromium.org/2063008 TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/2095006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47357 0039d316-1c4b-4281-b951-d872f2087c98
* (Original patch reviewed at http://codereview.chromium.org/2067003 )pkasting@chromium.org2010-05-151-4/+6
| | | | | | | | | | | | | | | | | | Track "display" and "run" separately for mixed content, and make the latter downgrade the SSL state to "authentication broken". Make the "display" state only affect the current tab (not the entire host). Fix an SSL browser test by supplying the appropriate SiteInstance*. Move a test from "disabled" to "flaky" since it at least passes for me. Make the SSLManager header and .cc files put functions in the same order, and make that order somewhat saner. BUG=15072, 18626, 40932, 42758 TEST=Covered by browser tests Review URL: http://codereview.chromium.org/2063008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47347 0039d316-1c4b-4281-b951-d872f2087c98
* Create first tests for verifying that Chrome Frame does not interfere with ↵kkania@chromium.org2010-05-148-69/+256
| | | | | | | | | | normal IE operation. BUG=none TEST=none Review URL: http://codereview.chromium.org/1992018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47336 0039d316-1c4b-4281-b951-d872f2087c98
* Candidate fix for bug 44108. The FromBindContext function was inherently ↵tommi@chromium.org2010-05-149-54/+89
| | | | | | | | | | | | | racy as it returned a pointer to a non-addrefed pointer and the AddRef/Release implementation in the BindContextInfo was not thread safe. Also fixed BSCBStorageBind object leak. TEST=See bug description BUG=44108 Review URL: http://codereview.chromium.org/2080005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47306 0039d316-1c4b-4281-b951-d872f2087c98
* Not using std::wstring to store progress status text because mshtml is ↵tommi@chromium.org2010-05-142-14/+65
| | | | | | | | | | | sensitive to NULL vs L"". TEST=see bug BUG=44103 Review URL: http://codereview.chromium.org/2118001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47232 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the chrome frame context menu back forward test which regressed in ↵ananta@chromium.org2010-05-144-15/+34
| | | | | | | | | | | | | | | | | revision 47187 due to a change in the context menu resource ids. Solution is to include the chrome_dll_resources.h file in a way to reduce conflicts with existing chrome frame resources. We have two new files chrome_imported_resources.cc/.h to achieve that. Fixes bug http://code.google.com/p/chromium/issues/detail?id=44134 Bug=44134 Review URL: http://codereview.chromium.org/2067006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47223 0039d316-1c4b-4281-b951-d872f2087c98
* Fix unit test breakage in last change.amit@chromium.org2010-05-132-3/+5
| | | | | | | | | | | | | | | Instead of returning E_FAIL from IStream::Read when there is no valid cache to serve content from, confirm tp the IStream Read contract and return S_FALSE with 0 bytes. TBR=stoyan TEST=MonikerPatchTest.CacheStream Review URL: http://codereview.chromium.org/2114001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47189 0039d316-1c4b-4281-b951-d872f2087c98