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

Unified Diff: chrome/browser/ui/views/chrome_views_delegate.cc

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4
Patch Set: and another rebase 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: chrome/browser/ui/views/chrome_views_delegate.cc
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index 0f1a9671ec96f3ee03523abcdb6f1513cecbd603..4a743b3f7020fc1156fa0fc2191fc83c0692e3f0 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -195,8 +195,9 @@ void ChromeViewsDelegate::SaveWindowPlacement(const views::Widget* window,
window_preferences->SetBoolean("maximized",
show_state == ui::SHOW_STATE_MAXIMIZED);
window_preferences->SetBoolean("docked", show_state == ui::SHOW_STATE_DOCKED);
- gfx::Rect work_area(gfx::Screen::GetScreenFor(window->GetNativeView())->
- GetDisplayNearestWindow(window->GetNativeView()).work_area());
+ gfx::Rect work_area(gfx::Screen::GetScreen()
+ ->GetDisplayNearestWindow(window->GetNativeView())
+ .work_area());
window_preferences->SetInteger("work_area_left", work_area.x());
window_preferences->SetInteger("work_area_top", work_area.y());
window_preferences->SetInteger("work_area_right", work_area.right());
@@ -237,8 +238,8 @@ bool ChromeViewsDelegate::GetSavedWindowPlacement(
gfx::NativeView window = widget->GetNativeView();
if (chrome::GetHostDesktopTypeForNativeView(window) ==
chrome::HOST_DESKTOP_TYPE_ASH) {
- gfx::Display display = gfx::Screen::GetScreenFor(window)->
- GetDisplayMatching(*bounds);
+ gfx::Display display =
+ gfx::Screen::GetScreen()->GetDisplayMatching(*bounds);
bounds->AdjustToFit(display.work_area());
ash::wm::GetWindowState(window)->set_minimum_visibility(true);
}
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc ('k') | chrome/browser/ui/views/exclusive_access_bubble_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698