extensions/browser/api/system_info/system_info_api.cc - Issue 1608053002: Remove now-unnecessary wrappers around gfx::Screen::GetScreen()

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: extensions/browser/api/system_info/system_info_api.cc

Issue 1608053002: Remove now-unnecessary wrappers around gfx::Screen::GetScreen() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-5

Patch Set: cros Created 4 years, 11 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 | « extensions/browser/api/system_display/system_display_apitest.cc ('k') | extensions/shell/browser/shell_display_info_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/system_info/system_info_api.cc

diff --git a/extensions/browser/api/system_info/system_info_api.cc b/extensions/browser/api/system_info/system_info_api.cc

index 74181cac6f04c7ea4d6b123faafab9b1945282c4..42679d66afd02b041796c36c9c57ec1dedfb7b3f 100644

--- a/extensions/browser/api/system_info/system_info_api.cc

+++ b/extensions/browser/api/system_info/system_info_api.cc

@@ -20,7 +20,6 @@

#include "components/storage_monitor/storage_info.h"

#include "components/storage_monitor/storage_monitor.h"

#include "content/public/browser/browser_thread.h"

-#include "extensions/browser/api/system_display/display_info_provider.h"

#include "extensions/browser/api/system_storage/storage_info_provider.h"

#include "extensions/browser/extensions_browser_client.h"

#include "extensions/common/api/system_display.h"

@@ -120,7 +119,7 @@ void SystemInfoEventRouter::AddEventListener(const std::string& event_name) {

return;

if (IsDisplayChangedEvent(event_name)) {

- gfx::Screen* screen = DisplayInfoProvider::Get()->GetActiveScreen();

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

if (screen)

screen->AddObserver(this);

}

@@ -146,7 +145,7 @@ void SystemInfoEventRouter::RemoveEventListener(const std::string& event_name) {

}

if (IsDisplayChangedEvent(event_name)) {

- gfx::Screen* screen = DisplayInfoProvider::Get()->GetActiveScreen();

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

if (screen)

screen->RemoveObserver(this);

}