OLD | NEW |
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_TAB_PROXY_H_ | 5 #ifndef CHROME_TEST_AUTOMATION_TAB_PROXY_H_ |
6 #define CHROME_TEST_AUTOMATION_TAB_PROXY_H_ | 6 #define CHROME_TEST_AUTOMATION_TAB_PROXY_H_ |
7 | 7 |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 | 9 |
10 #if defined(OS_WIN) | 10 #if defined(OS_WIN) |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 // completes or timeout (in milliseconds) occurs. If return after timeout, | 101 // completes or timeout (in milliseconds) occurs. If return after timeout, |
102 // is_timeout is set to true. | 102 // is_timeout is set to true. |
103 AutomationMsg_NavigationResponseValues NavigateToURLWithTimeout( | 103 AutomationMsg_NavigationResponseValues NavigateToURLWithTimeout( |
104 const GURL& url, int number_of_navigations, uint32 timeout_ms, | 104 const GURL& url, int number_of_navigations, uint32 timeout_ms, |
105 bool* is_timeout); | 105 bool* is_timeout); |
106 | 106 |
107 // Navigates to a url in an externally hosted tab. | 107 // Navigates to a url in an externally hosted tab. |
108 // This method accepts the same kinds of URL input that | 108 // This method accepts the same kinds of URL input that |
109 // can be passed to Chrome on the command line. This is a synchronous call and | 109 // can be passed to Chrome on the command line. This is a synchronous call and |
110 // hence blocks until the navigation completes. | 110 // hence blocks until the navigation completes. |
111 AutomationMsg_NavigationResponseValues NavigateInExternalTab(const GURL& url); | 111 AutomationMsg_NavigationResponseValues NavigateInExternalTab( |
| 112 const GURL& url, const GURL& referrer); |
| 113 |
112 AutomationMsg_NavigationResponseValues NavigateExternalTabAtIndex(int index); | 114 AutomationMsg_NavigationResponseValues NavigateExternalTabAtIndex(int index); |
113 | 115 |
114 // Navigates to a url. This is an asynchronous version of NavigateToURL. | 116 // Navigates to a url. This is an asynchronous version of NavigateToURL. |
115 // The function returns immediately after sending the LoadURL notification | 117 // The function returns immediately after sending the LoadURL notification |
116 // to the browser. | 118 // to the browser. |
117 // TODO(vibhor): Add a callback if needed in future. | 119 // TODO(vibhor): Add a callback if needed in future. |
118 // TODO(mpcomplete): If the navigation results in an auth challenge, the | 120 // TODO(mpcomplete): If the navigation results in an auth challenge, the |
119 // TabProxy we attach won't know about it. See bug 666730. | 121 // TabProxy we attach won't know about it. See bug 666730. |
120 bool NavigateToURLAsync(const GURL& url); | 122 bool NavigateToURLAsync(const GURL& url); |
121 | 123 |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
347 void OnMessageReceived(const IPC::Message& message); | 349 void OnMessageReceived(const IPC::Message& message); |
348 protected: | 350 protected: |
349 virtual ~TabProxy() {} | 351 virtual ~TabProxy() {} |
350 private: | 352 private: |
351 Lock list_lock_; // Protects the observers_list_. | 353 Lock list_lock_; // Protects the observers_list_. |
352 ObserverList<TabProxyDelegate> observers_list_; | 354 ObserverList<TabProxyDelegate> observers_list_; |
353 DISALLOW_COPY_AND_ASSIGN(TabProxy); | 355 DISALLOW_COPY_AND_ASSIGN(TabProxy); |
354 }; | 356 }; |
355 | 357 |
356 #endif // CHROME_TEST_AUTOMATION_TAB_PROXY_H_ | 358 #endif // CHROME_TEST_AUTOMATION_TAB_PROXY_H_ |
OLD | NEW |