diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 11:50:14 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 11:50:14 +0000 |
| commit | 11f1a2212d6e0ac041f1dfa9f7453f14c9b68d52 (patch) | |
| tree | e4dfe15b3e3d3d4aeb4e531dcc2d57594d943e62 /content/shell/webkit_test_controller.h | |
| parent | ef3cc75309b0101da8966066fba944a1ba75091e (diff) | |
| download | chromium_src-11f1a2212d6e0ac041f1dfa9f7453f14c9b68d52.zip chromium_src-11f1a2212d6e0ac041f1dfa9f7453f14c9b68d52.tar.gz chromium_src-11f1a2212d6e0ac041f1dfa9f7453f14c9b68d52.tar.bz2 | |
[content shell] add a method that explicitly discards the main window
Currently, it's discarded implicitly in ResetAfterLayoutTest.
Later, when reusing a web contents across multiple tests, we will only want
to discard the window when a fatal failure occurred.
BUG=171128
R=thakis@chromium.org
Review URL: https://codereview.chromium.org/12393041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185870 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/webkit_test_controller.h')
| -rw-r--r-- | content/shell/webkit_test_controller.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/content/shell/webkit_test_controller.h b/content/shell/webkit_test_controller.h index 5098a015..c031e0d 100644 --- a/content/shell/webkit_test_controller.h +++ b/content/shell/webkit_test_controller.h @@ -113,9 +113,15 @@ class WebKitTestController : public base::NonThreadSafe, const NotificationDetails& details) OVERRIDE; private: + enum WhetherToQuitMessageLoop { + QUIT_MESSAGE_LOOP, + DO_NOT_QUIT_MESSAGE_LOOP, + }; + static WebKitTestController* instance_; void TimeoutHandler(); + void DiscardMainWindow(WhetherToQuitMessageLoop quit_message_loop); // Message handlers. void OnAudioDump(const std::vector<unsigned char>& audio_dump); |