summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/mock_ie_event_sink_test.h
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 23:49:26 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 23:49:26 +0000
commit0b7a012d120787fe67d72f47a5ef695c7405fff6 (patch)
tree662f9b40bfbff90795a2ecc2fa2c744872eefe94 /chrome_frame/test/mock_ie_event_sink_test.h
parent1af1dfeff5d142a28b69906ac544be6675e6bf7a (diff)
downloadchromium_src-0b7a012d120787fe67d72f47a5ef695c7405fff6.zip
chromium_src-0b7a012d120787fe67d72f47a5ef695c7405fff6.tar.gz
chromium_src-0b7a012d120787fe67d72f47a5ef695c7405fff6.tar.bz2
Remove usage of the old page info dialogs in ChromeFrame and use the new page info bubble
instead. Changed the expectations of the corresponding chrome frame ui test to look for this window. Added support in ChromeFrame tests window watcher class to allow specifying window class names as well. Fixes bug http://code.google.com/p/chromium/issues/detail?id=59030 Bug=59030 Review URL: http://codereview.chromium.org/3864001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63138 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/mock_ie_event_sink_test.h')
-rw-r--r--chrome_frame/test/mock_ie_event_sink_test.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/test/mock_ie_event_sink_test.h b/chrome_frame/test/mock_ie_event_sink_test.h
index 898d14e..7e48137 100644
--- a/chrome_frame/test/mock_ie_event_sink_test.h
+++ b/chrome_frame/test/mock_ie_event_sink_test.h
@@ -252,8 +252,8 @@ class MockWindowObserver : public WindowObserver {
MOCK_METHOD1(OnWindowOpen, void (HWND hwnd)); // NOLINT
MOCK_METHOD1(OnWindowClose, void (HWND hwnd)); // NOLINT
- void WatchWindow(std::string caption_pattern) {
- window_watcher_.AddObserver(this, caption_pattern);
+ void WatchWindow(std::string caption_pattern, std::string class_pattern) {
+ window_watcher_.AddObserver(this, caption_pattern, class_pattern);
}
private: