chrome/browser/ui/views/status_bubble_views.cc - Issue 1920263003: Rename gfx::Display/Screen to display::Display/Screen in chrome

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1920263003: Rename gfx::Display/Screen to display::Display/Screen in chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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 | « chrome/browser/ui/views/screen_capture_notification_ui_views.cc ('k') | chrome/browser/ui/views/status_icons/status_tray_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/status_bubble_views.cc

diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc

index 24504b15a1ec5483d4efcfa86662add8d6f787f8..3c9a14ea1f5c3acb5eb469c78539b1a09e8a09fd 100644

--- a/chrome/browser/ui/views/status_bubble_views.cc

+++ b/chrome/browser/ui/views/status_bubble_views.cc

@@ -21,13 +21,13 @@

#include "third_party/skia/include/core/SkPaint.h"

#include "third_party/skia/include/core/SkRRect.h"

#include "ui/base/theme_provider.h"

+#include "ui/display/screen.h"

#include "ui/gfx/animation/animation_delegate.h"

#include "ui/gfx/animation/linear_animation.h"

#include "ui/gfx/canvas.h"

#include "ui/gfx/font_list.h"

#include "ui/gfx/geometry/point.h"

#include "ui/gfx/geometry/rect.h"

-#include "ui/gfx/screen.h"

#include "ui/gfx/skia_util.h"

#include "ui/gfx/text_elider.h"

#include "ui/gfx/text_utils.h"

@@ -807,8 +807,9 @@ void StatusBubbleViews::AvoidMouse(const gfx::Point& location) {

// Check if the bubble sticks out from the monitor or will obscure

// download shelf.

gfx::NativeView window = base_view_->GetWidget()->GetNativeView();

- gfx::Rect monitor_rect =

- gfx::Screen::GetScreen()->GetDisplayNearestWindow(window).work_area();

+ gfx::Rect monitor_rect = display::Screen::GetScreen()

+ ->GetDisplayNearestWindow(window)

+ .work_area();

const int bubble_bottom_y = top_left.y() + position_.y() + size_.height();

if (bubble_bottom_y + offset > monitor_rect.height() ||