Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5668)

Unified Diff: chrome/test/base/test_web_dialog_observer.h

Issue 10332231: Remove chrome::NOTIFICATION_WEB_DIALOG_SHOWN. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add web_dialog_observer.h to chrome_browser.gypi Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/chrome_notification_types.h ('k') | chrome/test/base/test_web_dialog_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/test_web_dialog_observer.h
diff --git a/chrome/test/base/test_web_dialog_observer.h b/chrome/test/base/test_web_dialog_observer.h
index 9fbaccf5786c04cab9f4dd1a0c83740f0d9496a6..e88894a4fd9c5410072478efe3c85a43dfeaf0aa 100644
--- a/chrome/test/base/test_web_dialog_observer.h
+++ b/chrome/test/base/test_web_dialog_observer.h
@@ -8,19 +8,22 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "chrome/browser/ui/webui/web_dialog_observer.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
class JsInjectionReadyObserver;
namespace content {
+class RenderViewHost;
class WebUI;
}
// For browser_tests, which run on the UI thread, run a second message
// MessageLoop to detect WebDialog creation and quit when the constructed
// WebUI instance is captured and ready.
-class TestWebDialogObserver : public content::NotificationObserver {
+class TestWebDialogObserver : public content::NotificationObserver,
+ public WebDialogObserver {
public:
// Create and register a new TestWebDialogObserver. If
// |js_injection_ready_observer| is non-NULL, notify it as soon as the RVH is
@@ -29,6 +32,11 @@ class TestWebDialogObserver : public content::NotificationObserver {
JsInjectionReadyObserver* js_injection_ready_observer);
virtual ~TestWebDialogObserver();
+ // Overridden from WebDialogObserver:
+ virtual void OnDialogShown(
+ content::WebUI* webui,
+ content::RenderViewHost* render_view_host) OVERRIDE;
+
// Waits for an WebDialog to be created. The WebUI instance is captured
// and the method returns it when the navigation on the dialog is complete.
content::WebUI* GetWebUI();
« no previous file with comments | « chrome/common/chrome_notification_types.h ('k') | chrome/test/base/test_web_dialog_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698