chrome/browser/ui/views/website_settings/permission_selector_view.h - 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/permission_selector_view.h

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/location_bar/content_setting_image_view.h ('k') | chrome/browser/ui/views/website_settings/website_settings_popup_view.cc » ('j') | components/content_settings.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/website_settings/permission_selector_view.h

diff --git a/chrome/browser/ui/views/website_settings/permission_selector_view.h b/chrome/browser/ui/views/website_settings/permission_selector_view.h

index d963307a5c055c5672a80dc2c9f24699a9a67441..9ae199957a92bb1d833683f1d0343765263fdfd4 100644

--- a/chrome/browser/ui/views/website_settings/permission_selector_view.h

+++ b/chrome/browser/ui/views/website_settings/permission_selector_view.h

@@ -14,7 +14,7 @@

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

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

#include "chrome/common/content_settings.h"

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

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

#include "ui/views/controls/button/menu_button_listener.h"

#include "ui/views/view.h"