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

Unified Diff: ash/shelf/overflow_bubble_view.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
« no previous file with comments | « ash/screen_util.cc ('k') | ash/shelf/shelf_bezel_event_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/overflow_bubble_view.cc
diff --git a/ash/shelf/overflow_bubble_view.cc b/ash/shelf/overflow_bubble_view.cc
index 7dae49a536995cb82cc6ce59004807ea9afdd165..5273e50684bdde0e6c1e5342a97d60b663a4927c 100644
--- a/ash/shelf/overflow_bubble_view.cc
+++ b/ash/shelf/overflow_bubble_view.cc
@@ -111,8 +111,10 @@ void OverflowBubbleView::ScrollByYOffset(int y_offset) {
gfx::Size OverflowBubbleView::GetPreferredSize() const {
gfx::Size preferred_size = GetContentsSize();
- const gfx::Rect monitor_rect = Shell::GetScreen()->GetDisplayNearestPoint(
- GetAnchorRect().CenterPoint()).work_area();
+ const gfx::Rect monitor_rect =
+ gfx::Screen::GetScreen()
+ ->GetDisplayNearestPoint(GetAnchorRect().CenterPoint())
+ .work_area();
if (!monitor_rect.IsEmpty()) {
if (IsHorizontalAlignment()) {
preferred_size.set_width(std::min(
@@ -194,8 +196,10 @@ gfx::Rect OverflowBubbleView::GetBubbleBounds() {
content_size,
false);
- gfx::Rect monitor_rect = Shell::GetScreen()->GetDisplayNearestPoint(
- anchor_rect.CenterPoint()).work_area();
+ gfx::Rect monitor_rect =
+ gfx::Screen::GetScreen()
+ ->GetDisplayNearestPoint(anchor_rect.CenterPoint())
+ .work_area();
int offset = 0;
if (views::BubbleBorder::is_arrow_on_horizontal(arrow())) {
« no previous file with comments | « ash/screen_util.cc ('k') | ash/shelf/shelf_bezel_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698