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

Side by Side Diff: content/browser/devtools/protocol/devtools_protocol_browsertest.cc

Issue 2412843002: Simplify the JavaScriptDialogManager. (Closed)
Patch Set: braces Created 4 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include <stddef.h> 5 #include <stddef.h>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/base64.h" 8 #include "base/base64.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 void RunBeforeUnloadDialog(WebContents* web_contents, 111 void RunBeforeUnloadDialog(WebContents* web_contents,
112 bool is_reload, 112 bool is_reload,
113 const DialogClosedCallback& callback) override {} 113 const DialogClosedCallback& callback) override {}
114 114
115 bool HandleJavaScriptDialog(WebContents* web_contents, 115 bool HandleJavaScriptDialog(WebContents* web_contents,
116 bool accept, 116 bool accept,
117 const base::string16* prompt_override) override { 117 const base::string16* prompt_override) override {
118 return true; 118 return true;
119 } 119 }
120 120
121 void CancelActiveAndPendingDialogs(WebContents* web_contents) override {} 121 void CancelDialogs(WebContents* web_contents,
122 122 bool suppress_callbacks,
123 void ResetDialogState(WebContents* web_contents) override {} 123 bool reset_state) override {}
124 124
125 private: 125 private:
126 DialogClosedCallback callback_; 126 DialogClosedCallback callback_;
127 bool handle_; 127 bool handle_;
128 DISALLOW_COPY_AND_ASSIGN(TestJavaScriptDialogManager); 128 DISALLOW_COPY_AND_ASSIGN(TestJavaScriptDialogManager);
129 }; 129 };
130 130
131 } 131 }
132 132
133 class DevToolsProtocolTest : public ContentBrowserTest, 133 class DevToolsProtocolTest : public ContentBrowserTest,
(...skipping 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after
1325 SendCommand("Target.setAutoAttach", std::move(command_params), false); 1325 SendCommand("Target.setAutoAttach", std::move(command_params), false);
1326 params = WaitForNotification("Target.detachedFromTarget", true); 1326 params = WaitForNotification("Target.detachedFromTarget", true);
1327 EXPECT_TRUE(params->GetString("targetId", &temp)); 1327 EXPECT_TRUE(params->GetString("targetId", &temp));
1328 EXPECT_EQ(target_id, temp); 1328 EXPECT_EQ(target_id, temp);
1329 params = WaitForNotification("Target.targetRemoved", true); 1329 params = WaitForNotification("Target.targetRemoved", true);
1330 EXPECT_TRUE(params->GetString("targetId", &temp)); 1330 EXPECT_TRUE(params->GetString("targetId", &temp));
1331 EXPECT_EQ(target_id, temp); 1331 EXPECT_EQ(target_id, temp);
1332 } 1332 }
1333 1333
1334 } // namespace content 1334 } // namespace content
OLDNEW
« no previous file with comments | « components/app_modal/javascript_dialog_manager.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698