ash/wm/workspace/workspace_layout_manager.cc - Issue 1608053002: Remove now-unnecessary wrappers around gfx::Screen::GetScreen()

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: ash/wm/workspace/workspace_layout_manager.cc

Issue 1608053002: Remove now-unnecessary wrappers around gfx::Screen::GetScreen() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-5

Patch Set: . Created 4 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:

View side-by-side diff with in-line comments

Download patch

« ash/wm/window_state_unittest.cc ('K') | « ash/wm/workspace/workspace_event_handler_unittest.cc ('k') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('j') | chrome/browser/extensions/display_info_provider_mac.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/workspace/workspace_layout_manager.cc

diff --git a/ash/wm/workspace/workspace_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc

index 6c8a8eeb40979fdc8b1a13d6b5c774cf5197eac1..443385317cf6f316f165ef1b58a1a6af2814df3e 100644

--- a/ash/wm/workspace/workspace_layout_manager.cc

+++ b/ash/wm/workspace/workspace_layout_manager.cc

@@ -40,9 +40,11 @@ WorkspaceLayoutManager::WorkspaceLayoutManager(aura::Window* window)

root_window_(window->GetRootWindow()),

work_area_in_parent_(ScreenUtil::ConvertRectFromScreen(

window_,

- Shell::GetScreen()->GetDisplayNearestWindow(window_).work_area())),

- is_fullscreen_(GetRootWindowController(

- window->GetRootWindow())->GetWindowForFullscreenMode() != NULL) {

+ gfx::Screen::GetScreen()

+ ->GetDisplayNearestWindow(window_)

+ .work_area())),

+ is_fullscreen_(GetRootWindowController(window->GetRootWindow())

+ ->GetWindowForFullscreenMode() != NULL) {

Shell::GetInstance()->activation_client()->AddObserver(this);

Shell::GetInstance()->AddShellObserver(this);

root_window_->AddObserver(this);

@@ -167,7 +169,7 @@ void WorkspaceLayoutManager::OnKeyboardBoundsChanging(

void WorkspaceLayoutManager::OnDisplayWorkAreaInsetsChanged() {

const gfx::Rect work_area(ScreenUtil::ConvertRectFromScreen(

window_,

- Shell::GetScreen()->GetDisplayNearestWindow(window_).work_area()));

+ gfx::Screen::GetScreen()->GetDisplayNearestWindow(window_).work_area()));

if (work_area != work_area_in_parent_) {

const wm::WMEvent event(wm::WM_EVENT_WORKAREA_BOUNDS_CHANGED);

AdjustAllWindowsBoundsForWorkAreaChange(&event);

@@ -305,7 +307,7 @@ void WorkspaceLayoutManager::AdjustAllWindowsBoundsForWorkAreaChange(

work_area_in_parent_ = ScreenUtil::ConvertRectFromScreen(

window_,

- Shell::GetScreen()->GetDisplayNearestWindow(window_).work_area());

+ gfx::Screen::GetScreen()->GetDisplayNearestWindow(window_).work_area());

// Don't do any adjustments of the insets while we are in screen locked mode.

// This would happen if the launcher was auto hidden before the login screen