| Index: chrome/browser/ui/libgtk2ui/gtk2_ui.cc
|
| diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
|
| index f563334b442b5fde28f05c2f500e34b17e39b422..433fc9d4d83d0bfde30aa3cfcb4774426a32410d 100644
|
| --- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
|
| +++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
|
| @@ -41,8 +41,8 @@
|
| #include "third_party/skia/include/core/SkShader.h"
|
| #include "ui/base/material_design/material_design_controller.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| +#include "ui/display/display.h"
|
| #include "ui/gfx/canvas.h"
|
| -#include "ui/gfx/display.h"
|
| #include "ui/gfx/geometry/rect.h"
|
| #include "ui/gfx/geometry/size.h"
|
| #include "ui/gfx/image/image.h"
|
| @@ -1382,8 +1382,8 @@ void Gtk2UI::UpdateDeviceScaleFactor(float device_scale_factor) {
|
| }
|
|
|
| float Gtk2UI::GetDeviceScaleFactor() const {
|
| - if (gfx::Display::HasForceDeviceScaleFactor())
|
| - return gfx::Display::GetForcedDeviceScaleFactor();
|
| + if (display::Display::HasForceDeviceScaleFactor())
|
| + return display::Display::GetForcedDeviceScaleFactor();
|
| const int kCSSDefaultDPI = 96;
|
| const float scale = GetDPI() / kCSSDefaultDPI;
|
|
|
|
|