diff options
| author | scottmg <scottmg@chromium.org> | 2016-01-26 17:30:36 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-27 01:31:58 +0000 |
| commit | fb33c340bd50b0e8a5c874e5d7c10a6361cee126 (patch) | |
| tree | bb7a28d9d333accda14d8cbce5d9c6e7b4f51698 /extensions/browser/app_window | |
| parent | bfe14dd182c7c660eb27265dfeec462768af2422 (diff) | |
| download | chromium_src-fb33c340bd50b0e8a5c874e5d7c10a6361cee126.zip chromium_src-fb33c340bd50b0e8a5c874e5d7c10a6361cee126.tar.gz chromium_src-fb33c340bd50b0e8a5c874e5d7c10a6361cee126.tar.bz2 | |
Remove ui/gfx/screen_type_delegate.h
This removes gfx::SCREEN_TYPE_NATIVE/SCREEN_TYPE_ALTERNATE, and there is
now only one Screen instance. It's still a runtime-installed thing for
test purposes.
TBR=various owners for trivial changes
R=oshima@chromium.org, sky@chromium.org
BUG=558054
Review URL: https://codereview.chromium.org/1608733002
Cr-Commit-Position: refs/heads/master@{#371676}
Diffstat (limited to 'extensions/browser/app_window')
| -rw-r--r-- | extensions/browser/app_window/app_window.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc index 75d5d40..5881f30 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()), |