diff options
| author | scottmg <scottmg@chromium.org> | 2016-01-26 17:30:36 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-27 01:31:58 +0000 |
| commit | fb33c340bd50b0e8a5c874e5d7c10a6361cee126 (patch) | |
| tree | bb7a28d9d333accda14d8cbce5d9c6e7b4f51698 /chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc | |
| parent | bfe14dd182c7c660eb27265dfeec462768af2422 (diff) | |
| download | chromium_src-fb33c340bd50b0e8a5c874e5d7c10a6361cee126.zip chromium_src-fb33c340bd50b0e8a5c874e5d7c10a6361cee126.tar.gz chromium_src-fb33c340bd50b0e8a5c874e5d7c10a6361cee126.tar.bz2 | |
Remove ui/gfx/screen_type_delegate.h
This removes gfx::SCREEN_TYPE_NATIVE/SCREEN_TYPE_ALTERNATE, and there is
now only one Screen instance. It's still a runtime-installed thing for
test purposes.
TBR=various owners for trivial changes
R=oshima@chromium.org, sky@chromium.org
BUG=558054
Review URL: https://codereview.chromium.org/1608733002
Cr-Commit-Position: refs/heads/master@{#371676}
Diffstat (limited to 'chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc')
| -rw-r--r-- | chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc index 525ab33..180d838 100644 --- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc +++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc @@ -300,7 +300,7 @@ ChromeBrowserMainExtraPartsMetrics::ChromeBrowserMainExtraPartsMetrics() ChromeBrowserMainExtraPartsMetrics::~ChromeBrowserMainExtraPartsMetrics() { if (is_screen_observer_) - gfx::Screen::GetNativeScreen()->RemoveObserver(this); + gfx::Screen::GetScreen()->RemoveObserver(this); } void ChromeBrowserMainExtraPartsMetrics::PreProfileInit() { @@ -345,9 +345,9 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserStart() { base::Bind(&RecordStartupMetricsOnBlockingPool), base::TimeDelta::FromSeconds(kStartupMetricsGatheringDelaySeconds)); - display_count_ = gfx::Screen::GetNativeScreen()->GetNumDisplays(); + display_count_ = gfx::Screen::GetScreen()->GetNumDisplays(); UMA_HISTOGRAM_COUNTS_100("Hardware.Display.Count.OnStartup", display_count_); - gfx::Screen::GetNativeScreen()->AddObserver(this); + gfx::Screen::GetScreen()->AddObserver(this); is_screen_observer_ = true; #if !defined(OS_ANDROID) @@ -371,7 +371,7 @@ void ChromeBrowserMainExtraPartsMetrics::OnDisplayMetricsChanged( } void ChromeBrowserMainExtraPartsMetrics::EmitDisplaysChangedMetric() { - int display_count = gfx::Screen::GetNativeScreen()->GetNumDisplays(); + int display_count = gfx::Screen::GetScreen()->GetNumDisplays(); if (display_count != display_count_) { display_count_ = display_count; UMA_HISTOGRAM_COUNTS_100("Hardware.Display.Count.OnChange", display_count_); |