chrome/browser/metrics/chromeos_metrics_provider.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/metrics/chromeos_metrics_provider.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/metrics/chrome_browser_main_extra_parts_metrics_unittest.cc ('k') | chrome/browser/plugins/plugin_power_saver_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/metrics/chromeos_metrics_provider.cc

diff --git a/chrome/browser/metrics/chromeos_metrics_provider.cc b/chrome/browser/metrics/chromeos_metrics_provider.cc

index a3b2e385547021a7cd054ca7219cfe11e6ca03e7..c63f9e1b2c37d8a83dd3a0435b9c66c0170ce858 100644

--- a/chrome/browser/metrics/chromeos_metrics_provider.cc

+++ b/chrome/browser/metrics/chromeos_metrics_provider.cc

@@ -25,8 +25,8 @@

#include "device/bluetooth/bluetooth_adapter.h"

#include "device/bluetooth/bluetooth_adapter_factory.h"

#include "device/bluetooth/bluetooth_device.h"

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

#include "ui/events/event_utils.h"

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

#if defined(USE_X11)

#include "ui/events/devices/x11/touch_factory_x11.h"

@@ -196,10 +196,11 @@ void ChromeOSMetricsProvider::ProvideSystemProfileMetrics(

metrics::SystemProfileProto::Hardware* hardware =

system_profile_proto->mutable_hardware();

hardware->set_hardware_class(hardware_class_);

- gfx::Display::TouchSupport has_touch = ui::GetInternalDisplayTouchSupport();

- if (has_touch == gfx::Display::TOUCH_SUPPORT_AVAILABLE)

+ display::Display::TouchSupport has_touch =

+ ui::GetInternalDisplayTouchSupport();

+ if (has_touch == display::Display::TOUCH_SUPPORT_AVAILABLE)

hardware->set_internal_display_supports_touch(true);

- else if (has_touch == gfx::Display::TOUCH_SUPPORT_UNAVAILABLE)

+ else if (has_touch == display::Display::TOUCH_SUPPORT_UNAVAILABLE)

hardware->set_internal_display_supports_touch(false);

WriteExternalTouchscreensProto(hardware);

}