diff options
| -rw-r--r-- | chrome/browser/automation/automation_provider.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/views/tabs/tab_dragging_test.cc | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 2e6a186..9730aea 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -1652,8 +1652,9 @@ void AutomationProvider::WindowSimulateDrag(int handle, bool press_escape_en_route, IPC::Message* reply_message) { bool succeeded = false; - if (window_tracker_->ContainsHandle(handle) && (drag_path.size() > 1)) { - gfx::NativeWindow window = window_tracker_->GetResource(handle); + if (browser_tracker_->ContainsHandle(handle) && (drag_path.size() > 1)) { + gfx::NativeWindow window = + browser_tracker_->GetResource(handle)->window()->GetNativeHandle(); succeeded = true; UINT down_message = 0; diff --git a/chrome/browser/views/tabs/tab_dragging_test.cc b/chrome/browser/views/tabs/tab_dragging_test.cc index 194dce1..e187e71 100644 --- a/chrome/browser/views/tabs/tab_dragging_test.cc +++ b/chrome/browser/views/tabs/tab_dragging_test.cc @@ -346,8 +346,7 @@ TEST_F(TabDraggingTest, Tab1Tab3Escape) { } // Drag Tab_2 out of the Tab strip. A new window should open with this tab. -// TODO(estade): undisable this pronto. -TEST_F(TabDraggingTest, DISABLED_Tab2OutOfTabStrip) { +TEST_F(TabDraggingTest, Tab2OutOfTabStrip) { scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); scoped_refptr<WindowProxy> window(browser->GetWindow()); |