Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(949)

Unified Diff: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
index 2be43e7226aed1485f753da9d097cd3b88c7a762..f8b89b012d064c585a6aaeafe1435ca7bc96f1db 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
@@ -223,14 +223,14 @@ bool GetTrackedByWorkspace(Browser* browser) {
#if defined(USE_ASH) && !defined(OS_WIN) // TODO(win_ash)
class ScreenEventGeneratorDelegate : public aura::test::EventGeneratorDelegate {
public:
- explicit ScreenEventGeneratorDelegate(aura::RootWindow* root_window)
+ explicit ScreenEventGeneratorDelegate(aura::Window* root_window)
: root_window_(root_window) {}
virtual ~ScreenEventGeneratorDelegate() {}
// EventGeneratorDelegate overrides:
virtual aura::RootWindow* GetRootWindowAt(
const gfx::Point& point) const OVERRIDE {
- return root_window_;
+ return root_window_->GetDispatcher();
}
virtual aura::client::ScreenPositionClient* GetScreenPositionClient(
@@ -239,7 +239,7 @@ class ScreenEventGeneratorDelegate : public aura::test::EventGeneratorDelegate {
}
private:
- aura::RootWindow* root_window_;
+ aura::Window* root_window_;
DISALLOW_COPY_AND_ASSIGN(ScreenEventGeneratorDelegate);
};
« no previous file with comments | « chrome/browser/ui/views/tabs/dock_info_win.cc ('k') | chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698