ui/aura/desktop/desktop_screen_win.h - Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+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/desktop/desktop_screen_win.h

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix new addition Created 8 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: ui/aura/desktop/desktop_screen_win.h

diff --git a/ui/aura/desktop/desktop_screen_win.h b/ui/aura/desktop/desktop_screen_win.h

index 7d67b195e673921e0fa423b3018cebbfdfe08d7b..2ec08a9deeca7a1dc19d3f12f52eb8492753f0ae 100644

--- a/ui/aura/desktop/desktop_screen_win.h

+++ b/ui/aura/desktop/desktop_screen_win.h

@@ -6,16 +6,17 @@

#define UI_AURA_DESKTOP_DESKTOP_SCREEN_WIN_H_

#include "ui/aura/aura_export.h"

-#include "ui/gfx/screen_impl.h"

+#include "ui/gfx/screen.h"

namespace aura {

-class AURA_EXPORT DesktopScreenWin : public gfx::ScreenImpl {

+class AURA_EXPORT DesktopScreenWin : public gfx::Screen {

public:

DesktopScreenWin();

virtual ~DesktopScreenWin();

- // Overridden from gfx::ScreenImpl:

+ // Overridden from gfx::Screen:

+ virtual bool IsDIPEnabled() OVERRIDE;

virtual gfx::Point GetCursorScreenPoint() OVERRIDE;

virtual gfx::NativeWindow GetWindowAtCursorScreenPoint() OVERRIDE;

virtual int GetNumDisplays() OVERRIDE;

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