| 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" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/platform_thread.h" | 12 #include "base/platform_thread.h" |
| 13 #include "base/process_util.h" | 13 #include "base/process_util.h" |
| 14 #include "base/ref_counted.h" | 14 #include "base/ref_counted.h" |
| 15 #include "base/waitable_event.h" | 15 #include "base/waitable_event.h" |
| 16 #include "chrome/common/chrome_descriptors.h" | |
| 17 #include "chrome/test/automation/automation_constants.h" | 16 #include "chrome/test/automation/automation_constants.h" |
| 18 #include "chrome/test/automation/automation_messages.h" | 17 #include "chrome/test/automation/automation_messages.h" |
| 19 #include "chrome/test/automation/browser_proxy.h" | 18 #include "chrome/test/automation/browser_proxy.h" |
| 20 #include "chrome/test/automation/tab_proxy.h" | 19 #include "chrome/test/automation/tab_proxy.h" |
| 21 #include "chrome/test/automation/window_proxy.h" | 20 #include "chrome/test/automation/window_proxy.h" |
| 21 #include "ipc/ipc_descriptors.h" |
| 22 #if defined(OS_WIN) | 22 #if defined(OS_WIN) |
| 23 // TODO(port): Enable when dialog_delegate is ported. | 23 // TODO(port): Enable when dialog_delegate is ported. |
| 24 #include "views/window/dialog_delegate.h" | 24 #include "views/window/dialog_delegate.h" |
| 25 #endif | 25 #endif |
| 26 | 26 |
| 27 using base::TimeDelta; | 27 using base::TimeDelta; |
| 28 using base::TimeTicks; | 28 using base::TimeTicks; |
| 29 | 29 |
| 30 namespace { | 30 namespace { |
| 31 | 31 |
| (...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 if (!p) { | 529 if (!p) { |
| 530 p = new T(this, tracker_.get(), handle); | 530 p = new T(this, tracker_.get(), handle); |
| 531 p->AddRef(); | 531 p->AddRef(); |
| 532 } | 532 } |
| 533 | 533 |
| 534 // Since there is no scoped_refptr::attach. | 534 // Since there is no scoped_refptr::attach. |
| 535 scoped_refptr<T> result; | 535 scoped_refptr<T> result; |
| 536 result.swap(&p); | 536 result.swap(&p); |
| 537 return result; | 537 return result; |
| 538 } | 538 } |
| OLD | NEW |