ui/aura/root_window.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: ui/aura/root_window.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:

Index: ui/aura/root_window.cc

diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc

index 38ea96d3c23d24ce13de4b102542fb2b51ccf25d..13dab5d37bb838f0a518bb4201a908e855412bd0 100644

--- a/ui/aura/root_window.cc

+++ b/ui/aura/root_window.cc

@@ -18,7 +18,6 @@

#include "ui/aura/client/cursor_client.h"

#include "ui/aura/client/event_client.h"

#include "ui/aura/client/screen_position_client.h"

-#include "ui/aura/display_manager.h"

#include "ui/aura/env.h"

#include "ui/aura/event_filter.h"

#include "ui/aura/focus_manager.h"

@@ -69,9 +68,9 @@ void GetEventFiltersToNotify(Window* target, EventFilters* filters) {

}

-float GetDeviceScaleFactorFromDisplay(const Window* window) {

- DisplayManager* display_manager = Env::GetInstance()->display_manager();

- return display_manager->GetDisplayNearestWindow(window).device_scale_factor();

+float GetDeviceScaleFactorFromDisplay(Window* window) {

+ return gfx::Screen::GetScreenFor(window)->

+ GetDisplayNearestWindow(window).device_scale_factor();

}

Window* ConsumerToWindow(ui::GestureConsumer* consumer) {

« no previous file with comments | « ui/aura/env.cc ('k') | ui/aura/single_display_manager.h » ('j') | no next file with comments »