chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc - Issue 11363124: Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11363124: Move DisplayManager and DisplayChangeObserverX11 from aura to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix rebase Created 8 years, 1 month 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

« no previous file with comments | « chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc ('k') | chrome/browser/ui/webui/options/chromeos/display_options_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 8ee2ea32ebccbf7a3713c6efc63c96a75b3d891c..7bca44356ad5c0ad3250412b5bd4388694220ca5 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

@@ -34,7 +34,7 @@

#if defined(USE_ASH)

#include "ash/display/display_controller.h"

-#include "ash/display/multi_display_manager.h"

+#include "ash/display/display_manager.h"

#include "ash/shell.h"

#include "ash/test/cursor_manager_test_api.h"

#include "ash/wm/cursor_manager.h"

@@ -1286,7 +1286,7 @@ void CancelDragTabToWindowInSeparateDisplayStep3(

ASSERT_EQ(2u, BrowserList::size());

// Switching display mode should cancel the drag operation.

- ash::internal::MultiDisplayManager::CycleDisplay();

+ ash::internal::DisplayManager::CycleDisplay();

}

// Invoked from the nested message loop.