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

Side by Side Diff: chrome/test/webdriver/webdriver_session.h

Issue 8401007: Don't run the pre and post handlers after chromedriver receives a termination request. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 9 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/test/webdriver/webdriver_session.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_TEST_WEBDRIVER_WEBDRIVER_SESSION_H_ 5 #ifndef CHROME_TEST_WEBDRIVER_WEBDRIVER_SESSION_H_
6 #define CHROME_TEST_WEBDRIVER_WEBDRIVER_SESSION_H_ 6 #define CHROME_TEST_WEBDRIVER_WEBDRIVER_SESSION_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 Point mouse_position_; 396 Point mouse_position_;
397 397
398 // Chrome does not have an individual method for setting the prompt text 398 // Chrome does not have an individual method for setting the prompt text
399 // of an alert. Instead, when the WebDriver client wants to set the text, 399 // of an alert. Instead, when the WebDriver client wants to set the text,
400 // we store it here and pass the text when the alert is accepted or 400 // we store it here and pass the text when the alert is accepted or
401 // dismissed. This text should only be used if |has_alert_prompt_text_| 401 // dismissed. This text should only be used if |has_alert_prompt_text_|
402 // is true, so that the default prompt text is not overridden. 402 // is true, so that the default prompt text is not overridden.
403 std::string alert_prompt_text_; 403 std::string alert_prompt_text_;
404 bool has_alert_prompt_text_; 404 bool has_alert_prompt_text_;
405 405
406 // True if the session has started the termination process.
407 bool terminated_;
408
406 Options options_; 409 Options options_;
407 410
408 DISALLOW_COPY_AND_ASSIGN(Session); 411 DISALLOW_COPY_AND_ASSIGN(Session);
409 }; 412 };
410 413
411 } // namespace webdriver 414 } // namespace webdriver
412 415
413 DISABLE_RUNNABLE_METHOD_REFCOUNT(webdriver::Session); 416 DISABLE_RUNNABLE_METHOD_REFCOUNT(webdriver::Session);
414 417
415 #endif // CHROME_TEST_WEBDRIVER_WEBDRIVER_SESSION_H_ 418 #endif // CHROME_TEST_WEBDRIVER_WEBDRIVER_SESSION_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/test/webdriver/webdriver_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698