| 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 #include <sstream> | 5 #include <sstream> |
| 6 | 6 |
| 7 #include "chrome/test/automation/automation_proxy.h" | 7 #include "chrome/test/automation/automation_proxy.h" |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/file_version_info.h" | 10 #include "base/file_version_info.h" |
| (...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 PlatformThread::Sleep(automation::kSleepTime); | 358 PlatformThread::Sleep(automation::kSleepTime); |
| 359 } | 359 } |
| 360 | 360 |
| 361 return false; | 361 return false; |
| 362 } | 362 } |
| 363 | 363 |
| 364 bool AutomationProxy::SetFilteredInet(bool enabled) { | 364 bool AutomationProxy::SetFilteredInet(bool enabled) { |
| 365 return Send(new AutomationMsg_SetFilteredInet(0, enabled)); | 365 return Send(new AutomationMsg_SetFilteredInet(0, enabled)); |
| 366 } | 366 } |
| 367 | 367 |
| 368 bool AutomationProxy::SendProxyConfig(const std::string& new_proxy_config) { |
| 369 return Send(new AutomationMsg_SetProxyConfig(0, new_proxy_config)); |
| 370 } |
| 371 |
| 368 void AutomationProxy::Disconnect() { | 372 void AutomationProxy::Disconnect() { |
| 369 channel_.reset(); | 373 channel_.reset(); |
| 370 } | 374 } |
| 371 | 375 |
| 372 void AutomationProxy::OnMessageReceived(const IPC::Message& msg) { | 376 void AutomationProxy::OnMessageReceived(const IPC::Message& msg) { |
| 373 // This won't get called unless AutomationProxy is run from | 377 // This won't get called unless AutomationProxy is run from |
| 374 // inside a message loop. | 378 // inside a message loop. |
| 375 NOTREACHED(); | 379 NOTREACHED(); |
| 376 } | 380 } |
| 377 | 381 |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 497 &handle)); | 501 &handle)); |
| 498 if (!succeeded) { | 502 if (!succeeded) { |
| 499 return NULL; | 503 return NULL; |
| 500 } | 504 } |
| 501 | 505 |
| 502 DCHECK(IsWindow(*external_tab_container)); | 506 DCHECK(IsWindow(*external_tab_container)); |
| 503 | 507 |
| 504 return new TabProxy(this, tracker_.get(), handle); | 508 return new TabProxy(this, tracker_.get(), handle); |
| 505 } | 509 } |
| 506 #endif // defined(OS_WIN) | 510 #endif // defined(OS_WIN) |
| OLD | NEW |