chrome/browser/extensions/api/settings_private/settings_private_event_router.h - Issue 2860553002: Clean up most of the ChromeOS headers in non-ChromeOS build

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/extensions/api/settings_private/settings_private_event_router.h

Issue 2860553002: Clean up most of the ChromeOS headers in non-ChromeOS build (Closed)

Patch Set: rebase Created 3 years, 7 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/extensions/api/page_capture/page_capture_apitest.cc ('k') | chrome/browser/extensions/api/web_request/web_request_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/settings_private/settings_private_event_router.h

diff --git a/chrome/browser/extensions/api/settings_private/settings_private_event_router.h b/chrome/browser/extensions/api/settings_private/settings_private_event_router.h

index 4c2f16667435be57c29fba7e99da71b20bd964d2..3b79001d779750de1a3f330ee0225c980ee88835 100644

--- a/chrome/browser/extensions/api/settings_private/settings_private_event_router.h

+++ b/chrome/browser/extensions/api/settings_private/settings_private_event_router.h

@@ -9,12 +9,18 @@

#include "base/macros.h"

#include "base/memory/weak_ptr.h"

-#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chrome/browser/extensions/api/settings_private/prefs_util.h"

#include "components/keyed_service/core/keyed_service.h"

#include "components/prefs/pref_change_registrar.h"

#include "extensions/browser/event_router.h"

+// TODO(wychen): ChromeOS headers should only be included when building

+// ChromeOS, and the following headers should be guarded by

+// #if defined(OS_CHROMEOS). However, the types are actually

+// used, and it takes another CL to clean them up.

+// Reference: crbug.com/720159

+#include "chrome/browser/chromeos/settings/cros_settings.h"

namespace content {

class BrowserContext;

}