chrome/browser/chrome_content_browser_client.cc - Issue 541813002: Componentize chrome/common/content_settings files.

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/chrome_content_browser_client.cc

Issue 541813002: Componentize chrome/common/content_settings files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: GN fix Created 6 years, 3 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:

Index: chrome/browser/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index 7418ac35eaa7925aabdf9c569a610f09500d98e1..a4b7252a71e52b059b07d600e056c60c0b8afc1d 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -81,7 +81,6 @@

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

-#include "chrome/common/content_settings.h"

#include "chrome/common/env_vars.h"

#include "chrome/common/logging_chrome.h"

#include "chrome/common/pepper_permission_util.h"

@@ -93,6 +92,7 @@

#include "chromeos/chromeos_constants.h"

#include "components/cdm/browser/cdm_message_filter_android.h"

#include "components/cloud_devices/common/cloud_devices_switches.h"

+#include "components/content_settings/core/common/content_settings.h"

#include "components/dom_distiller/core/url_constants.h"

#include "components/google/core/browser/google_util.h"

#include "components/metrics/client_info.h"