Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(411)

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: cros 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
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
« no previous file with comments | « ash/wm/workspace/workspace_event_handler_unittest.cc ('k') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698