chrome/browser/ui/views/tabs/tab_strip.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/tabs/tab_strip.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/tabs/tab_drag_controller_interactive_uitest.cc ('k') | chrome/browser/ui/views/tabs/window_finder_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/tabs/tab_strip.cc

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

index e540f8417e7a16538968614b09d780924c5081f7..1303b262410f73ae1ef9986eb74151b4aec637f8 100644

--- a/chrome/browser/ui/views/tabs/tab_strip.cc

+++ b/chrome/browser/ui/views/tabs/tab_strip.cc

@@ -49,17 +49,17 @@

#include "ui/base/resource/resource_bundle.h"

#include "ui/compositor/compositing_recorder.h"

#include "ui/compositor/paint_recorder.h"

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

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

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

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

#include "ui/gfx/canvas.h"

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

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

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

#include "ui/gfx/image/image_skia.h"

#include "ui/gfx/image/image_skia_operations.h"

#include "ui/gfx/path.h"

#include "ui/gfx/scoped_canvas.h"

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

#include "ui/gfx/skia_util.h"

#include "ui/views/controls/image_view.h"

#include "ui/views/masked_targeter_delegate.h"

@@ -2365,8 +2365,8 @@ gfx::Rect TabStrip::GetDropBounds(int drop_index,

drop_indicator_height);

// If the rect doesn't fit on the monitor, push the arrow to the bottom.

- gfx::Screen* screen = gfx::Screen::GetScreen();

- gfx::Display display = screen->GetDisplayMatching(drop_bounds);

+ display::Screen* screen = display::Screen::GetScreen();

+ display::Display display = screen->GetDisplayMatching(drop_bounds);

*is_beneath = !display.bounds().Contains(drop_bounds);

if (*is_beneath)

drop_bounds.Offset(0, drop_bounds.height() + height());