| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/browser/automation/testing_automation_provider.h" | 5 #include "chrome/browser/automation/testing_automation_provider.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 6034 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6045 } | 6045 } |
| 6046 if (!args->GetInteger("navigation_count", &navigation_count)) { | 6046 if (!args->GetInteger("navigation_count", &navigation_count)) { |
| 6047 AutomationJSONReply(this, reply_message) | 6047 AutomationJSONReply(this, reply_message) |
| 6048 .SendError("'navigation_count' missing or invalid"); | 6048 .SendError("'navigation_count' missing or invalid"); |
| 6049 return; | 6049 return; |
| 6050 } | 6050 } |
| 6051 new NavigationNotificationObserver( | 6051 new NavigationNotificationObserver( |
| 6052 &tab_contents->controller(), this, reply_message, | 6052 &tab_contents->controller(), this, reply_message, |
| 6053 navigation_count, false, true); | 6053 navigation_count, false, true); |
| 6054 browser->OpenURLFromTab(tab_contents, OpenURLParams( | 6054 browser->OpenURLFromTab(tab_contents, OpenURLParams( |
| 6055 GURL(url), GURL(), CURRENT_TAB, | 6055 GURL(url), content::Referrer(), CURRENT_TAB, |
| 6056 content::PAGE_TRANSITION_TYPED, false)); | 6056 content::PAGE_TRANSITION_TYPED, false)); |
| 6057 } | 6057 } |
| 6058 | 6058 |
| 6059 void TestingAutomationProvider::ExecuteJavascriptJSON( | 6059 void TestingAutomationProvider::ExecuteJavascriptJSON( |
| 6060 DictionaryValue* args, | 6060 DictionaryValue* args, |
| 6061 IPC::Message* reply_message) { | 6061 IPC::Message* reply_message) { |
| 6062 if (SendErrorIfModalDialogActive(this, reply_message)) | 6062 if (SendErrorIfModalDialogActive(this, reply_message)) |
| 6063 return; | 6063 return; |
| 6064 | 6064 |
| 6065 string16 frame_xpath, javascript; | 6065 string16 frame_xpath, javascript; |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6561 | 6561 |
| 6562 Send(reply_message_); | 6562 Send(reply_message_); |
| 6563 redirect_query_ = 0; | 6563 redirect_query_ = 0; |
| 6564 reply_message_ = NULL; | 6564 reply_message_ = NULL; |
| 6565 } | 6565 } |
| 6566 | 6566 |
| 6567 void TestingAutomationProvider::OnRemoveProvider() { | 6567 void TestingAutomationProvider::OnRemoveProvider() { |
| 6568 if (g_browser_process) | 6568 if (g_browser_process) |
| 6569 g_browser_process->GetAutomationProviderList()->RemoveProvider(this); | 6569 g_browser_process->GetAutomationProviderList()->RemoveProvider(this); |
| 6570 } | 6570 } |
| OLD | NEW |