chrome/browser/ui/content_settings/content_setting_bubble_model.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/ui/content_settings/content_setting_bubble_model.cc

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

Patch Set: 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/ui/content_settings/content_setting_bubble_model.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

index d0bc409d87e0cf480aa18b028e44611051f1911e..102ddb65fae0c0592bc35fa2e2baf0f3f9d36ec9 100644

--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

@@ -23,10 +23,10 @@

#include "chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h"

#include "chrome/browser/ui/content_settings/media_setting_changed_infobar_delegate.h"

#include "chrome/common/chrome_switches.h"

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

#include "chrome/common/pref_names.h"

#include "chrome/common/render_messages.h"

#include "chrome/grit/generated_resources.h"

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

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

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

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