chrome/app/chrome_main_delegate.cc - Issue 518803009: Move content_settings_pattern and content_settings_pattern_parser to the content_settings component.

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/app/chrome_main_delegate.cc

Issue 518803009: Move content_settings_pattern and content_settings_pattern_parser to the content_settings component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/app/chrome_main_delegate.cc

diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc

index 0aed05b3bf191fd4854f93292dc8b019c0aea526..8bd915997281c03171ad3ebd2e00edc4ff6fb4c5 100644

--- a/chrome/app/chrome_main_delegate.cc

+++ b/chrome/app/chrome_main_delegate.cc

@@ -26,7 +26,6 @@

#include "chrome/common/chrome_paths_internal.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

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

#include "chrome/common/crash_keys.h"

#include "chrome/common/logging_chrome.h"

#include "chrome/common/profiling.h"

@@ -36,6 +35,7 @@

#include "chrome/renderer/chrome_content_renderer_client.h"

#include "chrome/utility/chrome_content_utility_client.h"

#include "components/component_updater/component_updater_paths.h"

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

#include "components/startup_metric_utils/startup_metric_utils.h"

#include "content/public/common/content_client.h"

#include "content/public/common/content_paths.h"

« no previous file with comments | « chrome/app/DEPS ('k') | chrome/browser/android/banners/app_banner_settings_helper.cc » ('j') | no next file with comments »