Index: content/shell/webkit_test_controller.h |
diff --git a/content/shell/webkit_test_controller.h b/content/shell/webkit_test_controller.h |
index 17f01fc3472de64cc6161d17d4e07b34c4d66088..d394cd1cb6407e7842b14a28520939765cb404eb 100644 |
--- a/content/shell/webkit_test_controller.h |
+++ b/content/shell/webkit_test_controller.h |
@@ -12,6 +12,8 @@ |
#include "base/file_path.h" |
#include "base/synchronization/lock.h" |
#include "base/threading/non_thread_safe.h" |
+#include "content/public/browser/notification_observer.h" |
+#include "content/public/browser/notification_registrar.h" |
#include "content/public/browser/render_view_host_observer.h" |
#include "content/public/browser/web_contents_observer.h" |
#include "webkit/glue/webpreferences.h" |
@@ -65,7 +67,8 @@ class WebKitTestResultPrinter { |
}; |
class WebKitTestController : public base::NonThreadSafe, |
- public WebContentsObserver { |
+ public WebContentsObserver, |
+ public NotificationObserver { |
public: |
static WebKitTestController* Get(); |
@@ -101,6 +104,11 @@ class WebKitTestController : public base::NonThreadSafe, |
virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE; |
virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE; |
+ // NotificationObserver implementation. |
+ virtual void Observe(int type, |
+ const NotificationSource& source, |
+ const NotificationDetails& details) OVERRIDE; |
+ |
private: |
static WebKitTestController* instance_; |
@@ -136,6 +144,8 @@ class WebKitTestController : public base::NonThreadSafe, |
Shell* main_window_; |
+ int current_pid_; |
+ |
bool enable_pixel_dumping_; |
std::string expected_pixel_hash_; |
@@ -157,6 +167,8 @@ class WebKitTestController : public base::NonThreadSafe, |
mutable base::Lock lock_; |
bool can_open_windows_; |
+ NotificationRegistrar registrar_; |
+ |
DISALLOW_COPY_AND_ASSIGN(WebKitTestController); |
}; |