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

Unified Diff: chrome/test/chromedriver/javascript_dialog_manager.cc

Issue 12848005: [chromedriver] Separate stuff of chrome from chromedriver. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments and fix compile error on mac. Created 7 years, 9 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
Index: chrome/test/chromedriver/javascript_dialog_manager.cc
diff --git a/chrome/test/chromedriver/javascript_dialog_manager.cc b/chrome/test/chromedriver/javascript_dialog_manager.cc
deleted file mode 100644
index ed8aa70c84e5d35e70533a3fc43d6c3fad4b7d6c..0000000000000000000000000000000000000000
--- a/chrome/test/chromedriver/javascript_dialog_manager.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/test/chromedriver/javascript_dialog_manager.h"
-
-#include "base/logging.h"
-#include "base/values.h"
-#include "chrome/test/chromedriver/devtools_client.h"
-#include "chrome/test/chromedriver/status.h"
-
-JavaScriptDialogManager::JavaScriptDialogManager(DevToolsClient* client)
- : client_(client) {
- client_->AddListener(this);
-}
-
-JavaScriptDialogManager::~JavaScriptDialogManager() {
-}
-
-bool JavaScriptDialogManager::IsDialogOpen() {
- client_->HandleReceivedEvents();
- return !unhandled_dialog_queue_.empty();
-}
-
-Status JavaScriptDialogManager::GetDialogMessage(std::string* message) {
- if (!IsDialogOpen())
- return Status(kNoAlertOpen);
-
- *message = unhandled_dialog_queue_.front();
- return Status(kOk);
-}
-
-Status JavaScriptDialogManager::HandleDialog(bool accept,
- const std::string& text) {
- if (!IsDialogOpen())
- return Status(kNoAlertOpen);
-
- base::DictionaryValue params;
- params.SetBoolean("accept", accept);
- params.SetString("promptText", text);
- Status status = client_->SendCommand("Page.handleJavaScriptDialog", params);
- if (status.IsError())
- return status;
-
- // Remove a dialog from the queue. Need to check the queue is not empty here,
- // because it could have been cleared during waiting for the command
- // response.
- if (unhandled_dialog_queue_.size())
- unhandled_dialog_queue_.pop_front();
- return Status(kOk);
-}
-
-Status JavaScriptDialogManager::OnConnected() {
- unhandled_dialog_queue_.clear();
- base::DictionaryValue params;
- return client_->SendCommand("Page.enable", params);
-}
-
-void JavaScriptDialogManager::OnEvent(const std::string& method,
- const base::DictionaryValue& params) {
- if (method == "Page.javascriptDialogOpening") {
- std::string message;
- if (!params.GetString("message", &message)) {
- LOG(ERROR) << "dialog event missing or invalid 'message'";
- }
- unhandled_dialog_queue_.push_back(message);
- } else if (method == "Page.javascriptDialogClosing") {
- // Inspector only sends this event when all dialogs have been closed.
- // Clear the unhandled queue in case the user closed a dialog manually.
- unhandled_dialog_queue_.clear();
- }
-}
« no previous file with comments | « chrome/test/chromedriver/javascript_dialog_manager.h ('k') | chrome/test/chromedriver/javascript_dialog_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698