diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-10 01:14:41 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-10 01:14:41 +0000 |
| commit | f30e74751217091c0b6050080f46cd6eb4914226 (patch) | |
| tree | a2dcb8e715d1578698856e38c36459602dc19732 /chrome_frame/chrome_tab.idl | |
| parent | 9b2ab5910c58603ec655bb613bec7596e732f87b (diff) | |
| download | chromium_src-f30e74751217091c0b6050080f46cd6eb4914226.zip chromium_src-f30e74751217091c0b6050080f46cd6eb4914226.tar.gz chromium_src-f30e74751217091c0b6050080f46cd6eb4914226.tar.bz2 | |
Adding a privileged callback used in IE CF to check whether to show
the version mismatch warning dialog. Used this in ceee/ to only show
it once per tab.
Changed the logic in Firefox to show the warning dialog even when
in privileged mode. This will mean it gets shown once per Firefox
window.
Wrote a unit test for the additional logic in ChromeFrameActivex.
To write the unit test, used com_mock.py to generate a mock of
the IChromeFramePrivileged interface. This can be extended to
generate mocks of the other CF interfaces.
Discovered duplication of np_browser_functions.h and .cc, resolved
this to a single copy (the one under chrome_frame).
Changed things around so chrome_tab.idl is built only once; this
also lets me more easily depend on it in the com_mock rule.
BUG=none
TEST=chrome_frame_unittests.exe
Review URL: http://codereview.chromium.org/4563001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_tab.idl')
| -rw-r--r-- | chrome_frame/chrome_tab.idl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome_frame/chrome_tab.idl b/chrome_frame/chrome_tab.idl index 7120910..5f3dcbb 100644 --- a/chrome_frame/chrome_tab.idl +++ b/chrome_frame/chrome_tab.idl @@ -95,7 +95,7 @@ interface IChromeFrameInternal : IUnknown { [ object, - uuid(655A11E0-EF63-4fbe-9DF6-C182D2FCD6DC), + uuid(8AD52429-3CE0-4883-BC69-2DFA055D20D4), oleautomation, nonextensible, hidden, @@ -113,6 +113,10 @@ interface IChromeFramePrivileged : IUnknown { // Return S_FALSE to leave the default, which is to not automate any // functions. HRESULT GetExtensionApisToAutomate([out] BSTR *extension_apis); + // Called when an automation version mismatch occurs. Returns S_OK if + // a dialog should be showed to the user by this CF instance, S_FALSE if + // not. + HRESULT ShouldShowVersionMismatchDialog(); }; // Expose this service to the ChromeFrame control to trigger privileged |