OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/test/webdriver/webdriver_automation.h" | 5 #include "chrome/test/webdriver/webdriver_automation.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
799 if (!view_id.old_style()) { | 799 if (!view_id.old_style()) { |
800 AutomationMsg_NavigationResponseValues navigate_response; | 800 AutomationMsg_NavigationResponseValues navigate_response; |
801 if (!SendNavigateToURLJSONRequest(automation(), view_locator, url, | 801 if (!SendNavigateToURLJSONRequest(automation(), view_locator, url, |
802 0, &navigate_response, &auto_error)) { | 802 0, &navigate_response, &auto_error)) { |
803 *error = Error::FromAutomationError(auto_error); | 803 *error = Error::FromAutomationError(auto_error); |
804 return; | 804 return; |
805 } | 805 } |
806 } else { | 806 } else { |
807 scoped_refptr<BrowserProxy> browser = | 807 scoped_refptr<BrowserProxy> browser = |
808 automation()->GetBrowserWindow(view_locator.browser_index()); | 808 automation()->GetBrowserWindow(view_locator.browser_index()); |
809 if (!browser) { | 809 if (!browser.get()) { |
810 *error = new Error(kUnknownError, "Couldn't obtain browser proxy"); | 810 *error = new Error(kUnknownError, "Couldn't obtain browser proxy"); |
811 return; | 811 return; |
812 } | 812 } |
813 scoped_refptr<TabProxy> tab = browser->GetTab(view_locator.tab_index()); | 813 scoped_refptr<TabProxy> tab = browser->GetTab(view_locator.tab_index()); |
814 if (!tab) { | 814 if (!tab.get()) { |
815 *error = new Error(kUnknownError, "Couldn't obtain tab proxy"); | 815 *error = new Error(kUnknownError, "Couldn't obtain tab proxy"); |
816 return; | 816 return; |
817 } | 817 } |
818 if (!tab->NavigateToURLAsync(GURL(url))) { | 818 if (!tab->NavigateToURLAsync(GURL(url))) { |
819 *error = new Error(kUnknownError, "Unable to navigate to url"); | 819 *error = new Error(kUnknownError, "Unable to navigate to url"); |
820 return; | 820 return; |
821 } | 821 } |
822 } | 822 } |
823 } | 823 } |
824 | 824 |
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1220 } | 1220 } |
1221 | 1221 |
1222 Error* Automation::CheckMaximizeSupported() { | 1222 Error* Automation::CheckMaximizeSupported() { |
1223 const char* message = | 1223 const char* message = |
1224 "Maximize automation interface is not supported for this version of " | 1224 "Maximize automation interface is not supported for this version of " |
1225 "Chrome."; | 1225 "Chrome."; |
1226 return CheckVersion(1160, message); | 1226 return CheckVersion(1160, message); |
1227 } | 1227 } |
1228 | 1228 |
1229 } // namespace webdriver | 1229 } // namespace webdriver |
OLD | NEW |