chrome/browser/ui/cocoa/browser_window_controller.mm - Issue 1938473002: Rename gfx::Display/Screen to display::Display/Screen in chrome/content/extensions 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: chrome/browser/ui/cocoa/browser_window_controller.mm

Issue 1938473002: Rename gfx::Display/Screen to display::Display/Screen in chrome/content/extensions mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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

« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_mac_unittest.mm ('k') | content/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/browser_window_controller.mm

diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm

index 41c9db392e960b1c7e0efa4614fb462b0ccebe0a..b1282f99e10c61de73ad2e445a3386da01066fb9 100644

--- a/chrome/browser/ui/cocoa/browser_window_controller.mm

+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm

@@ -99,9 +99,9 @@

#import "ui/base/cocoa/nsview_additions.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/l10n/l10n_util_mac.h"

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

#import "ui/gfx/mac/coordinate_conversion.h"

#include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h"

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

using bookmarks::BookmarkModel;

using bookmarks::BookmarkNode;

@@ -1939,7 +1939,7 @@ willAnimateFromState:(BookmarkBar::State)oldState

// However, if the user is using multiple monitors and turned off

// "Separate Space in Each Display", use Immersive Fullscreen so

// that the other monitors won't blank out.

- gfx::Screen* screen = gfx::Screen::GetScreen();

+ display::Screen* screen = display::Screen::GetScreen();

BOOL hasMultipleMonitors = screen && screen->GetNumDisplays() > 1;

if (chrome::mac::SupportsSystemFullscreen() &&

base::mac::IsOSYosemiteOrLater() &&