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

Unified Diff: content/shell/webkit_test_controller.h

Issue 11819028: [content shell] report the PID of a crashed renderer, and always report crashes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | « no previous file | content/shell/webkit_test_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « no previous file | content/shell/webkit_test_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698