summaryrefslogtreecommitdiffstats
path: root/chrome_frame
Commit message (Collapse)AuthorAgeFilesLines
* Added new IPC message class for CommandBuffer.apatrick@google.com2009-12-041-2/+2
| | | | | | | | | | Increased IPC message header type from 16 bits to 32 bits so it can accomodate more message classes. TEST=none BUG=none Review URL: http://codereview.chromium.org/399013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33832 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes to the string MatchPattern functions:tony@chromium.org2009-12-031-1/+1
| | | | | | | | | | | | | | | 1) Make it explicit that it only supports ASCII (since it iterates character by character). 2) Limit the recursion to 16 levels. We could allow more, but in the case of a ?, it has exponential complexity, so I figured 16 was a good stopping point. It seems rare that someone would have more than 16 '?' and '*'s. BUG=28645 Review URL: http://codereview.chromium.org/460047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33748 0039d316-1c4b-4281-b951-d872f2087c98
* Remove erroneous DCHECK that is reached when loading pages that don't call ↵robertshield@chromium.org2009-12-032-11/+21
| | | | | | | | | | | | | | | out to wininet like about:blank. Altering constant name pulled in from latest platform SDK to avoid naming conflicts for those with said SDK. Add slightly more logging to error messages. BUG=DCHECK hit when loading about:blank. TEST=Load about:blank in a debug build and no DCHECK is seen. Review URL: http://codereview.chromium.org/465030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33706 0039d316-1c4b-4281-b951-d872f2087c98
* Adding support for Chrome Frame to be loaded via the presence of an ↵robertshield@chromium.org2009-12-036-23/+180
| | | | | | | | | | | | | X-UA-Compatible HTTP header (in addition to the meta tag support). Also pins the CF module into the process such that it won't get unloaded. Doing this to work around how we can get unloaded without unpatching properly. BUG=22802 TEST=Navigate to a web site whose server sends the X-UA-Compatible: chrome=1 HTTP header and ensure that the page is loaded in CF. Review URL: http://codereview.chromium.org/465009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33629 0039d316-1c4b-4281-b951-d872f2087c98
* Disabling the following tests as they consistently fail on the chrome frame ↵ananta@chromium.org2009-12-021-4/+11
| | | | | | | | | | | | | | | | builder. 1. FullTabIE_CFInstallBasic 2. FullTabIE_CFInstallDismiss 3. FullTabIE_CFInstallOverlay 4. FullTabIE_CFInstallPlace Bug=29193 TBR=slightlyoff Review URL: http://codereview.chromium.org/465008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33578 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes to get the chrome frame network tests up and running on the chrome ↵ananta@chromium.org2009-12-021-2/+10
| | | | | | | | | | | | | | | | | frame builder. Fixes as below:- 1. Instantiate the SystemMonitor object as it is needed to instantiate the profile. 2. Adds the single-process command line to the chrome_frame_net_tests executable to ensure that the webkit thread gets initialized correctly. 3. Register additional prefs in the profile to get around some DCHECKS which fire in debug mode TBR=tommi Review URL: http://codereview.chromium.org/464001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33570 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a crash caused by a race condition between the time the ↵ananta@chromium.org2009-12-022-10/+17
| | | | | | | | | | | | | | | | | | UrlmonUrlRequest::EndRequestInternal task executing and the OnStopBinding function getting called by Urlmon. If our task executes first we essentially operate on an invalid object. Fixes http://code.google.com/p/chromium/issues/detail?id=29033 Added a comment to the EndRequest function indicating that it is invalid to access any members after it is called. Added a helper function to release the bindings and revoke the bind status callback. Bug=29033 Review URL: http://codereview.chromium.org/456013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33551 0039d316-1c4b-4281-b951-d872f2087c98
* [GTTF] Reduce header dependencies in chrome.phajdan.jr@chromium.org2009-11-302-0/+3
| | | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/454004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33324 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 33301 and 33305 due to unit_tests breakage.maruel@chromium.org2009-11-302-3/+0
| | | | | | | | TBR=pawel Review URL: http://codereview.chromium.org/453007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33309 0039d316-1c4b-4281-b951-d872f2087c98
* [GTTF] Reduce header dependencies in chrome.phajdan.jr@chromium.org2009-11-302-0/+3
| | | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/454004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33301 0039d316-1c4b-4281-b951-d872f2087c98
* Make SystemMonitor not a Singleton and move it out of basephajdan.jr@chromium.org2009-11-261-1/+1
| | | | | | | | | | | | | SystemMonitor makes an assumption that through its lifetime a MessageLoop exists and stays the same. It is difficult and error-prone to satisfy that when it is a Singleton. It has caused problems in the past. Additionally, extract HighResoltionTimerManager out of time_win.cc, eliminating yet another Singleton. TEST=none BUG=none Review URL: http://codereview.chromium.org/431008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33214 0039d316-1c4b-4281-b951-d872f2087c98
* Enable ETW logging in Chrome Frame.siggi@chromium.org2009-11-251-0/+9
| | | | | | | | | BUG=0 TEST=none Review URL: http://codereview.chromium.org/437064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33122 0039d316-1c4b-4281-b951-d872f2087c98
* Load chrome.dll as a resource dll so that resources can be loaded by the ↵tommi@chromium.org2009-11-252-2/+11
| | | | | | | | | | | browser. TEST=fixes net tests for chrome frame BUG=none Review URL: http://codereview.chromium.org/437050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33094 0039d316-1c4b-4281-b951-d872f2087c98
* Transfer CF downloads to the host browser.TEST=Click a download link (not ↵tommi@chromium.org2009-11-255-42/+180
| | | | | | | | via redirect) in a web page displayed by Chrome Frame. The request should be handled by the host browser.BUG=23561 Review URL: http://codereview.chromium.org/385108 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33022 0039d316-1c4b-4281-b951-d872f2087c98
* ChromeFrame's host network stack implementation for IE full tab mode ↵ananta@chromium.org2009-11-242-30/+86
| | | | | | | | | | | | | | | | | | | | | | | | implicitly follows redirects. When Chrome receives a notification about a redirect it also attempts to follow the redirect request. While this works in most cases, some sites actually returned an error for the second request initiated by Chrome. Fix is to abort the request in urlmon, when we receive a notification about a redirect. I also fixed the IsRedirectResponse function in the UrlRequestAutomationJob class to only treat 301, 302, 303 and 307 as redirect codes on the same lines as the default http job. Test=covered by existing network tests. I also verified that http://code.google.com/p/chromium/issues/detail?id=25643 works with this CL. Fixes http://code.google.com/p/chromium/issues/detail?id=28296 Bug=28296 Review URL: http://codereview.chromium.org/402107 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32896 0039d316-1c4b-4281-b951-d872f2087c98
* Unit test for back/forward for url fragments. Improvements in the testingamit@chromium.org2009-11-233-18/+227
| | | | | | | | | | | | framwork include a non-scriptable interface for getting window handles from chrome frame activex and methods for sending input in the WebBrowserSink. BUG=none TEST=back forward unit test for url fragments (anchor) Review URL: http://codereview.chromium.org/430002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32882 0039d316-1c4b-4281-b951-d872f2087c98
* Fix Chrome frame builder redness.ananta@chromium.org2009-11-231-2/+5
| | | | | | | | | | | The CLSCTX_ENABLE_CLOAKING flag if passed in to CoCreateInstance for Internet Explorer on IE causes the API to fail with E_INVALIDARG. We now or in this flag only for vista or greater. TBR=stoyan Review URL: http://codereview.chromium.org/434013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32869 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "installer: clean up to use FilePath instead of std::wstring."kuchhal@chromium.org2009-11-231-3/+3
| | | | | | | | | | | This reverts commit 9da05365beb211e3879e6049547e5e92c4c0a5a2 (r32811). TBR=thiago.farina@gmail.com BUG=32811 Review URL: http://codereview.chromium.org/437011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32817 0039d316-1c4b-4281-b951-d872f2087c98
* installer: clean up to use FilePath instead of std::wstring.kuchhal@chromium.org2009-11-231-3/+3
| | | | | | | | | | BUG=24672 TEST=installer_util_unittests and setup_unittests Review URL: http://codereview.chromium.org/385129 Patch from Thiago Farina <thiago.farina@gmail.com>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32811 0039d316-1c4b-4281-b951-d872f2087c98
* Tommi, please review everything. John please review the changes to ↵ananta@chromium.org2009-11-213-14/+26
| | | | | | | | | | | | | | | | | | plugin_service.cc/.h The test automation provider registers itself as a protocol factory for http/https requests. This is to ensure that intercepts set by the url request network tests work correctly. I was seeing these tests fail consistently on my setup as their intercept function would never get called. The other change is to add a simple mechanism based on a boolean flag to disable browser side plugins like gears which also intercept network requests and expect to be called on the IO thread. The chrome frame network tests run in a relatively simple environment where the network tests run in a separate thread (not the IO thread) which causes a number of DCHECKS to fire in debug build test runs. The flag used to determine whether browser plugins are loaded defaults to true. Review URL: http://codereview.chromium.org/414017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32739 0039d316-1c4b-4281-b951-d872f2087c98
* Launch COM server IE as low integrity process on Vista.stoyan@chromium.org2009-11-203-26/+130
| | | | | | Review URL: http://codereview.chromium.org/402089 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32699 0039d316-1c4b-4281-b951-d872f2087c98
* Move use_host_network test out of ChromeFrame.stoyan@chromium.org2009-11-191-135/+0
| | | | | | | | Some refactoring of ExternalTabUITestMockClient. TEST=ui_tests Review URL: http://codereview.chromium.org/384058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32504 0039d316-1c4b-4281-b951-d872f2087c98
* Ensure that the renderer has focus when ChromeFrame navigates to a URL in IE ↵ananta@chromium.org2009-11-194-8/+48
| | | | | | | | | | | | | full tab mode. This fixes bug http://code.google.com/p/chromium/issues/detail?id=22745 Test=Covered by unit test. Bug=22745 Review URL: http://codereview.chromium.org/402079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32497 0039d316-1c4b-4281-b951-d872f2087c98
* Updates test to use new document location for overlay nodes.slightlyoff@chromium.org2009-11-191-5/+5
| | | | | | | | | | | BUG=none TEST=none TBR=iyengar Review URL: http://codereview.chromium.org/405029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32489 0039d316-1c4b-4281-b951-d872f2087c98
* Make UtilChangePersistentNPAPIMarker return true on unregistration ifjoi@chromium.org2009-11-191-1/+5
| | | | | | | | | | | the marker did not previously exist. BUG=none TEST=call the UnregisterNPAPIPlugin entrypoint on npchrome_tab.dll when the NPAPI plug-in is not previously installed with Firefox; it should not return an error. Review URL: http://codereview.chromium.org/402062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32480 0039d316-1c4b-4281-b951-d872f2087c98
* Respect the "allowall" value for the X-Frame-Options header, as somejoi@chromium.org2009-11-195-15/+106
| | | | | | | | | | | | front-ends send this rather than simply omitting the X-Frame-Options header altogether. BUG=none TEST=chrome_frame_unittests.exe Review URL: http://codereview.chromium.org/404003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32473 0039d316-1c4b-4281-b951-d872f2087c98
* Back/Forward support for url fragmentsamit@chromium.org2009-11-1920-256/+1252
| | | | | | | | | | | | | | | | | Added support for anchor (url fragments). this involves mainly implementing IPersistHistory. The rest of the stuff is a song and dance to get called in IPersistHistory in the first place and then behave correctly when we do. BUG=23981 TEst=unit tests added and back forward with '#' URLs, sub frames etc. Review URL: http://codereview.chromium.org/371004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32454 0039d316-1c4b-4281-b951-d872f2087c98
* The FullTabModeIE_ChromeFrameKeyboardTest test would never complete at ↵ananta@chromium.org2009-11-182-11/+17
| | | | | | | | | | | | | | | | | times. This test fabricates keyboard input to IE by forcing the IE window to the foreground. This is achieved by registering a hot key, sending a keyboard message and waiting in a message loop for the hot key message. Apparently there are scenarios where this hot key message is not dispatched at all and we end up waiting in the message loop for ever. To get around this, we set a timer and if this fires we exit the loop. TBR=amit Review URL: http://codereview.chromium.org/406005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32359 0039d316-1c4b-4281-b951-d872f2087c98
* Disabling the About ChromeFrame test as this is consistently failing on the ↵ananta@chromium.org2009-11-181-1/+3
| | | | | | | | | | | | | buildbot. Reopened bug http://code.google.com/p/chromium/issues/detail?id=26549 Bug=26549 TBR=amit Review URL: http://codereview.chromium.org/400031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32281 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes detection logic for IE under XP SP2.slightlyoff@chromium.org2009-11-181-2/+10
| | | | | | | | | BUG=28038 Test=none Review URL: http://codereview.chromium.org/397028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32250 0039d316-1c4b-4281-b951-d872f2087c98
* Don't treat CF in privileged mode as an iframe for framebustingjoi@chromium.org2009-11-172-2/+5
| | | | | | | | | | | headers. BUG=none TEST=none Review URL: http://codereview.chromium.org/402013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32183 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a race condition in InitializeAndPatchProtocolsIfNeeded as discovered by ↵tommi@chromium.org2009-11-133-13/+24
| | | | | | | | | | | MAD. TEST=Should fix the issue MAD saw when starting up and tearing down the host browser in quick succession. Please see bug description. BUG=27641 Review URL: http://codereview.chromium.org/387049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31935 0039d316-1c4b-4281-b951-d872f2087c98
* Added a regression test which validates that keystrokes are received ↵ananta@chromium.org2009-11-134-1/+127
| | | | | | | | | | | | | | | correctly in ChromeFrame. We specifically test for uppercase characters generated in combination with the Shift key. Added a helper function to explicitly give focus to a passed in HWND. This is done by sending the mouse move/mouse down and mouse up events to the window. We also use this in the AboutChromeFrame test, which was flaky at times. Bug=27173,26549 Review URL: http://codereview.chromium.org/389029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31915 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a crash in ChromeActiveDocument::IEExec() when m_spClientSite is null.robertshield@chromium.org2009-11-121-1/+1
| | | | | | | | | | BUG=27414 TEST=None Review URL: http://codereview.chromium.org/384094 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31852 0039d316-1c4b-4281-b951-d872f2087c98
* The ChromeFrameAutomationClient class needs to be refcounted as it ↵ananta@chromium.org2009-11-1212-78/+62
| | | | | | | | | | | | | | | | | | | | | | implements the PluginRequestHandler interface which is maintained by individual requests which can outlive the active document/activex instances. I ran into a crash where UrlmonUrlRequest was calling into an invalid PluginRequestHandler pointer which had been destroyed just before. We also need to ensure that UrlmonUrlRequest and ChromeFrameActiveXBase select the multi threaded model as AddRef/Release can be invoked from multiple threads. I also removed the CleanupAsyncRequests function in ChromeFrameAutomationClient and moved all the code to CleanupRequests, which ensures that we treat synchronous and asynchronous requests similarly. There are instances where an automation client instance is created and destroyed without being initialized which causes a spurious assert to fire in the Uninitialize function. I added a check in the Uninitialize function to return if the state is uninitialized. Bug=none Review URL: http://codereview.chromium.org/386014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31792 0039d316-1c4b-4281-b951-d872f2087c98
* ChromeFrame HTTP requests would randomly fail if we navigated to multiple ↵ananta@chromium.org2009-11-115-33/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTTP sites. This was because the automation resource message filter tracked HTTP requests based on the request ids which are generated by the renderer process. As a result a new request would get created say with id 0, while an existing request would end in ChromeFrame causing the new request to incorrectly shutdown. Fix is to revert back to the original way of tracking requests with an auto incrementing id. The automation url job maintains both ids now, i.e. the automation request id and the chrome request id. The download notification receives the automation id and basically looks up the associated automation request id and sends the notification back to ChromeFrame. This fixes bug http://code.google.com/p/chromium/issues/detail?id=27401 Other fixes in this CL include the following:- 1. The active document instance would never get destroyed. This was because we call ShowUI on the doc host which maintains a reference. We need to call HideUI in Setsite of NULL, which releases the reference. 2. When the active x instance is shutting down we try to shutdown all running requests in the OnDestroy handler. To ensure that the request is deleted from the request map and released in the same thread which created it we post a task back to the ui thread which never runs as the window is being destroyed. Fix is to create a message only window with every urlmonrequest instance which supports task marshaling. Tests in a future CL. Bug=27401 Review URL: http://codereview.chromium.org/386008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31731 0039d316-1c4b-4281-b951-d872f2087c98
* Add NPAPI plugin registration persistence code to chrome frame. If the DLL ↵robertshield@chromium.org2009-11-113-1/+81
| | | | | | | | is already registered as an NPAPI plugin, keep that registration information up to date across updates. Review URL: http://codereview.chromium.org/385015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31697 0039d316-1c4b-4281-b951-d872f2087c98
* This CL fixes the following issues:-ananta@chromium.org2009-11-112-10/+33
| | | | | | | | | | | | | | | | | | | | | | | 1. http://code.google.com/p/chromium/issues/detail?id=27200 This was a crash which would occur in the Stop function in the UrlmonUrlRequest object which would get invoked when the active document instance was being destroyed. The crash occured if the active document instance was reused in which case we end up reusing the automation client instance. The fix is to ensure that we clean up existing requests from the map before reusing the automation client instance. 2. http://code.google.com/p/chromium/issues/detail?id=27202 This was a DCHECK which would occur when adding a new request to the request map, which indicated that an existing request with the same request id existed in the map. This would occur during a redirect where the request id is reused by Chrome. Fix is to remove the request from the map when we handle the AutomationMsg_RequestEnd message in the UI thread itself. The UrlmonUrlRequest functions which attempt to remove the request from the map now check if the request is valid before doing this. Bug=27200,27202 Review URL: http://codereview.chromium.org/388008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31681 0039d316-1c4b-4281-b951-d872f2087c98
* Making no automation the default - this was the intent of a previousjoi@chromium.org2009-11-102-4/+6
| | | | | | | | | | | | change (not calling SetEnableExtensionAutomation on startup unless some functions are being automated) that missed this outstanding issue. BUG=none TEST=none Review URL: http://codereview.chromium.org/380009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31557 0039d316-1c4b-4281-b951-d872f2087c98
* Updates CFInstall.js to:slightlyoff@chromium.org2009-11-108-54/+460
| | | | | | | | | | | | | | * 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
* More memory stats code cleanup:sgk@chromium.org2009-11-092-6/+4
| | | | | | | | | | | | Move GetSystemCommitCharge() into bsae\process_util*. Kill PrintChromeMemoryUsageInfo(), which was only used by reliability_tests.exe on Windows and whose stats are obsolete. Delete the now-unnecessary chrome\test\perf\mem_usage* files. BUG=none TEST=none Review URL: http://codereview.chromium.org/371025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31423 0039d316-1c4b-4281-b951-d872f2087c98
* Allowing JS to set/reset extension automation, this makes for morejoi@chromium.org2009-11-082-0/+55
| | | | | | | | | | | | | | | flexible testing when you want to automate different sets of functions in different tests. Now instead of needing to destroy your CF and then create a new one with a different automation functions attribute, you can just call the function to reset on the existing one, then call it again to enable a different set. BUG=none TEST=none Review URL: http://codereview.chromium.org/375014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31406 0039d316-1c4b-4281-b951-d872f2087c98
* Modifying extension automation so that it is done through a particularjoi@chromium.org2009-11-082-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | tab for all extension views. Previously, API routing to the automation client would only work for extension views that were contained in the particular ExternalTab instance being automated. This meant you couldn't test API calls from e.g. background pages. Also using async functions instead of the previous RVH-based hack. Updating one of the UI tests to make the API calls from a background page, to provide an end-to-end test of the new routing. This makes AutomationProvider::SetEnableAutomationExtension Windows-only, but it effectively always was since it was already dependent on ExternalTabContainer (indirectly, to provide a non-empty implementation of TabContentsDelegate::ForwardMessageToExternalHost). BUG=none TEST=ui_tests.exe, chrome_frame_tests.exe, chrome_frame_unittests.exe Review URL: http://codereview.chromium.org/366025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31403 0039d316-1c4b-4281-b951-d872f2087c98
* Basic wiring to enable downloads for CF's host browser network stack. A ↵tommi@chromium.org2009-11-079-13/+45
| | | | | | | | notable change here is that url automation job id's no longer exist and instead a request id is used. There's a 1 to 1 relation between a job and a request so this is more convenient. Review URL: http://codereview.chromium.org/355036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31363 0039d316-1c4b-4281-b951-d872f2087c98
* Eliminate icu_stubs. Things still seem to link fine without these. I ↵pkasting@chromium.org2009-11-073-258/+0
| | | | | | | | | | | | suspect splitting utf_string_conversions out of string_utils on the Chrome side helped here. If I don't eliminate these, I need to patch them for bug 4010, but I'm not going to do that if they aren't needed. BUG=4010 TEST=none Review URL: http://codereview.chromium.org/371039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31343 0039d316-1c4b-4281-b951-d872f2087c98
* Get rid of GetMemoryInfo() in favor of using base::ProcessMetrics.sgk@chromium.org2009-11-051-11/+20
| | | | | | | | | | Use a test-specific subclass to isolate the stopgap use of 'ps' to collect memory stats on Mac. BUG=none TEST=none Review URL: http://codereview.chromium.org/342070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31144 0039d316-1c4b-4281-b951-d872f2087c98
* Continue to remove CHROME_FRAME_BUILD define from code that goes into ↵robertshield@chromium.org2009-11-043-3/+9
| | | | | | | | | | | | | | | | | | | | | chrome.dll. This reworks the browser distribution code to use the ChromeFrameBrowserDistribution iff --chrome-frame is present on the command line. Also, * At startup, chrome.exe now uses the BrowserDistribution code to determine where the Chromium version key resides (instead of hard coding it). * The installer now propagates the presence of --verbose-logging to uninstalls. * The chrome_launcher now allows the --chrome-frame switch through to chrome. * The installer now accepts a --chrome-frame switch. * Remove almost all occurences of the CHROME_FRAME_BUILD define from the installer. BUG=26012, 26603 TEST=Chrome Frame still builds and runs correctly. Chrome Frame builds built without 'branding'='Chrome' now install correctly. Review URL: http://codereview.chromium.org/345021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31015 0039d316-1c4b-4281-b951-d872f2087c98
* Marking the AboutChromeFrame test flaky.slightlyoff@chromium.org2009-11-031-1/+1
| | | | | | | | | | TEST=None BUG=26549 TBR=ananta Review URL: http://codereview.chromium.org/348051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30783 0039d316-1c4b-4281-b951-d872f2087c98
* Don't switch to CF's active document for frames or iframes.This fixes an ↵tommi@chromium.org2009-11-038-29/+147
| | | | | | | | issue where a page that uses CF would be loaded in an IFRAME on Google Images.Instead of attempting to load CF (not supported), we now defer to the host browser. Previously a blank page was displayed.TEST=Run new unit tests: FullTabModeIE_SubIFrame and FullTabModeIE_SubFrameBUG=22989 Review URL: http://codereview.chromium.org/343086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30782 0039d316-1c4b-4281-b951-d872f2087c98
* Add a switch to the whitelist.joi@chromium.org2009-11-021-2/+3
| | | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/354012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30756 0039d316-1c4b-4281-b951-d872f2087c98