chrome/browser/ui/views/website_settings/website_settings_popup_view.cc - Issue 410993002: Componentize content_settings_types.h

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/ui/views/website_settings/website_settings_popup_view.cc

Issue 410993002: Componentize content_settings_types.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge with trunk Created 6 years, 5 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/ui/views/website_settings/permission_selector_view.h ('k') | chrome/browser/ui/website_settings/permission_menu_model.h » ('j') | components/content_settings.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

index ec91143d761d5ff1ccd0a6e3214c10799470cf0b..3d2a10dada4d4418708d6028aee98cb63a31f82a 100644

--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

+++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

@@ -17,8 +17,8 @@

#include "chrome/browser/ui/views/website_settings/permission_selector_view.h"

#include "chrome/browser/ui/website_settings/website_settings.h"

#include "chrome/browser/ui/website_settings/website_settings_utils.h"

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

#include "chrome/common/url_constants.h"

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

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

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

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