summaryrefslogtreecommitdiffstats
path: root/chrome/test/automation
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test/automation')
-rw-r--r--chrome/test/automation/automation_proxy.cc25
-rw-r--r--chrome/test/automation/automation_proxy.h8
-rw-r--r--chrome/test/automation/tab_proxy.cc2
3 files changed, 1 insertions, 34 deletions
diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc
index 8371d74..8a0ed36 100644
--- a/chrome/test/automation/automation_proxy.cc
+++ b/chrome/test/automation/automation_proxy.cc
@@ -376,31 +376,6 @@ bool AutomationProxy::OpenNewBrowserWindow(Browser::Type type, bool show) {
show));
}
-scoped_refptr<TabProxy> AutomationProxy::CreateExternalTab(
- const ExternalTabSettings& settings,
- gfx::NativeWindow* external_tab_container,
- gfx::NativeWindow* tab) {
- int handle = 0;
- int session_id = 0;
- bool succeeded =
- Send(new AutomationMsg_CreateExternalTab(settings,
- external_tab_container,
- tab,
- &handle,
- &session_id));
- if (!succeeded) {
- return NULL;
- }
-
-#if defined(OS_WIN) && !defined(USE_AURA)
- DCHECK(IsWindow(*external_tab_container));
-#else // defined(OS_WIN)
- DCHECK(*external_tab_container);
-#endif // defined(OS_WIN)
- DCHECK(tracker_->GetResource(handle) == NULL);
- return new TabProxy(this, tracker_.get(), handle);
-}
-
template <class T> scoped_refptr<T> AutomationProxy::ProxyObjectFromHandle(
int handle) {
if (!handle)
diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h
index 7f426cc..788a3dc 100644
--- a/chrome/test/automation/automation_proxy.h
+++ b/chrome/test/automation/automation_proxy.h
@@ -181,14 +181,6 @@ class AutomationProxy : public IPC::Listener, public AutomationMessageSender {
// the tracker.
virtual void InvalidateHandle(const IPC::Message& message);
- // Creates a tab that can hosted in an external process. The function
- // returns a TabProxy representing the tab as well as a window handle
- // that can be reparented in another process.
- scoped_refptr<TabProxy> CreateExternalTab(
- const ExternalTabSettings& settings,
- gfx::NativeWindow* external_tab_container,
- gfx::NativeWindow* tab);
-
base::TimeDelta action_timeout() const {
return action_timeout_;
}
diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc
index a883070..2dcb0dd 100644
--- a/chrome/test/automation/tab_proxy.cc
+++ b/chrome/test/automation/tab_proxy.cc
@@ -385,7 +385,7 @@ bool TabProxy::CaptureEntirePageAsPNG(const base::FilePath& path) {
path, &error);
}
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN)
void TabProxy::Reposition(HWND window, HWND window_insert_after, int left,
int top, int width, int height, int flags,
HWND parent_window) {