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

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

Issue 6685099: Removing command_execution_timeout_ms in favor of action_max_timeout_ms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 bool LoginWithUserAndPass(const std::string& username, 223 bool LoginWithUserAndPass(const std::string& username,
224 const std::string& password) WARN_UNUSED_RESULT; 224 const std::string& password) WARN_UNUSED_RESULT;
225 #endif 225 #endif
226 226
227 #if defined(OS_POSIX) 227 #if defined(OS_POSIX)
228 base::file_handle_mapping_vector fds_to_map() const; 228 base::file_handle_mapping_vector fds_to_map() const;
229 #endif 229 #endif
230 230
231 // AutomationMessageSender implementation. 231 // AutomationMessageSender implementation.
232 virtual bool Send(IPC::Message* message) WARN_UNUSED_RESULT; 232 virtual bool Send(IPC::Message* message) WARN_UNUSED_RESULT;
233 virtual bool Send(IPC::Message* message, int timeout_ms) WARN_UNUSED_RESULT;
233 234
234 // Wrapper over AutomationHandleTracker::InvalidateHandle. Receives the 235 // Wrapper over AutomationHandleTracker::InvalidateHandle. Receives the
235 // message from AutomationProxy, unpacks the messages and routes that call to 236 // message from AutomationProxy, unpacks the messages and routes that call to
236 // the tracker. 237 // the tracker.
237 virtual void InvalidateHandle(const IPC::Message& message); 238 virtual void InvalidateHandle(const IPC::Message& message);
238 239
239 // Creates a tab that can hosted in an external process. The function 240 // Creates a tab that can hosted in an external process. The function
240 // returns a TabProxy representing the tab as well as a window handle 241 // returns a TabProxy representing the tab as well as a window handle
241 // that can be reparented in another process. 242 // that can be reparented in another process.
242 scoped_refptr<TabProxy> CreateExternalTab( 243 scoped_refptr<TabProxy> CreateExternalTab(
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 309
309 // Delay to let the browser execute the command. 310 // Delay to let the browser execute the command.
310 base::TimeDelta command_execution_timeout_; 311 base::TimeDelta command_execution_timeout_;
311 312
312 base::PlatformThreadId listener_thread_id_; 313 base::PlatformThreadId listener_thread_id_;
313 314
314 DISALLOW_COPY_AND_ASSIGN(AutomationProxy); 315 DISALLOW_COPY_AND_ASSIGN(AutomationProxy);
315 }; 316 };
316 317
317 #endif // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H_ 318 #endif // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698