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

Side by Side Diff: chrome/test/automation/automation_proxy.h

Issue 10282: Only block alert() requests from blocked popups; not all popups.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 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
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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_AUTOMATION_AUTOMATION_PROXY_H__ 5 #ifndef CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__
6 #define CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__ 6 #define CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 // Returns false if the window count does not change before time out. 101 // Returns false if the window count does not change before time out.
102 // TODO(evanm): this function has a confusing name and semantics; it should 102 // TODO(evanm): this function has a confusing name and semantics; it should
103 // be deprecated for WaitForWindowCountToBecome. 103 // be deprecated for WaitForWindowCountToBecome.
104 bool WaitForWindowCountToChange(int count, int* new_counter, 104 bool WaitForWindowCountToChange(int count, int* new_counter,
105 int wait_timeout); 105 int wait_timeout);
106 106
107 // Block the thread until the window count becomes the provided value. 107 // Block the thread until the window count becomes the provided value.
108 // Returns true on success. 108 // Returns true on success.
109 bool WaitForWindowCountToBecome(int target_count, int wait_timeout); 109 bool WaitForWindowCountToBecome(int target_count, int wait_timeout);
110 110
111 // Returns whether an app modal dialog window is showing right now (i.e., a
112 // javascript alert).
113 bool GetShowingAppModalDialog(bool* showing_app_modal_dialog);
114
115 // Block the thread until a modal dialog is displayed. Returns true on
116 // success.
117 bool WaitForAppModalDialog(int wait_timeout);
118
111 // Returns the BrowserProxy for the browser window at the given index, 119 // Returns the BrowserProxy for the browser window at the given index,
112 // transferring ownership of the pointer to the caller. 120 // transferring ownership of the pointer to the caller.
113 // On failure, returns NULL. 121 // On failure, returns NULL.
114 // 122 //
115 // Use GetBrowserWindowCount to see how many browser windows you can ask for. 123 // Use GetBrowserWindowCount to see how many browser windows you can ask for.
116 // Window numbers are 0-based. 124 // Window numbers are 0-based.
117 BrowserProxy* GetBrowserWindow(int window_index); 125 BrowserProxy* GetBrowserWindow(int window_index);
118 126
119 // Returns the BrowserProxy for the browser window which was last active, 127 // Returns the BrowserProxy for the browser window which was last active,
120 // transferring ownership of the pointer to the caller. 128 // transferring ownership of the pointer to the caller.
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 HANDLE new_tab_ui_load_complete_; 218 HANDLE new_tab_ui_load_complete_;
211 int new_tab_ui_load_time_; 219 int new_tab_ui_load_time_;
212 220
213 AutomationRequest* current_request_; 221 AutomationRequest* current_request_;
214 222
215 static const int kMaxCommandExecutionTime; // Delay to let the browser 223 static const int kMaxCommandExecutionTime; // Delay to let the browser
216 // execute the command.; 224 // execute the command.;
217 }; 225 };
218 226
219 #endif // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__ 227 #endif // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__
220
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698