ui/gfx/screen_mac.mm - Issue 110283005: Make aura_demo work on Mac

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/gfx/screen_mac.mm

Issue 110283005: Make aura_demo work on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix resolve Created 6 years, 11 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:

Index: ui/gfx/screen_mac.mm

diff --git a/ui/gfx/screen_mac.mm b/ui/gfx/screen_mac.mm

index 51c0b665b7e34274b98cf4c2d3386898af8c98f3..377c8592210b93f00da814c6383c2343d7c28fe7 100644

--- a/ui/gfx/screen_mac.mm

+++ b/ui/gfx/screen_mac.mm

@@ -154,7 +154,10 @@ class ScreenMac : public gfx::Screen {

virtual gfx::Display GetDisplayNearestWindow(

gfx::NativeView view) const OVERRIDE {

- NSWindow* window = [view window];

+ NSWindow* window = nil;

+#if !defined(USE_AURA)

+ window = [view window];

+#endif

if (!window)

return GetPrimaryDisplay();

NSScreen* match_screen = [window screen];

@@ -209,8 +212,10 @@ class ScreenMac : public gfx::Screen {

namespace gfx {

+#if !defined(USE_AURA)

Screen* CreateNativeScreen() {

return new ScreenMac;

}

+#endif

}

« no previous file with comments | « ui/base/view_prop.h ('k') | ui/resources/ui_resources.grd » ('j') | no next file with comments »