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

Unified Diff: extensions/browser/app_window/app_window.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: fixes 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: extensions/browser/app_window/app_window.cc
diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc
index 75d5d4083e43c3aefc1d4d670d8d68cd6da707a2..5881f30ce530a0b090319e7361cc02e778b3e89b 100644
--- a/extensions/browser/app_window/app_window.cc
+++ b/extensions/browser/app_window/app_window.cc
@@ -851,7 +851,7 @@ void AppWindow::SetNativeWindowFullscreen() {
bool AppWindow::IntersectsWithTaskbar() const {
#if defined(OS_WIN)
- gfx::Screen* screen = gfx::Screen::GetNativeScreen();
+ gfx::Screen* screen = gfx::Screen::GetScreen();
gfx::Rect window_bounds = native_app_window_->GetRestoredBounds();
std::vector<gfx::Display> displays = screen->GetAllDisplays();
@@ -1012,7 +1012,7 @@ void AppWindow::SaveWindowPosition() {
gfx::Rect bounds = native_app_window_->GetRestoredBounds();
gfx::Rect screen_bounds =
- gfx::Screen::GetNativeScreen()->GetDisplayMatching(bounds).work_area();
+ gfx::Screen::GetScreen()->GetDisplayMatching(bounds).work_area();
ui::WindowShowState window_state = native_app_window_->GetRestoredState();
cache->SaveGeometry(
extension_id(), window_key_, bounds, screen_bounds, window_state);
@@ -1078,7 +1078,7 @@ AppWindow::CreateParams AppWindow::LoadDefaults(CreateParams params)
&cached_state)) {
// App window has cached screen bounds, make sure it fits on screen in
// case the screen resolution changed.
- gfx::Screen* screen = gfx::Screen::GetNativeScreen();
+ gfx::Screen* screen = gfx::Screen::GetScreen();
gfx::Display display = screen->GetDisplayMatching(cached_bounds);
gfx::Rect current_screen_bounds = display.work_area();
SizeConstraints constraints(params.GetWindowMinimumSize(gfx::Insets()),

Powered by Google App Engine
This is Rietveld 408576698