chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.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/android/content_settings/popup_blocked_infobar_delegate.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:

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

Download patch

Index: chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc

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

index 9c3a3d6d13271b188c1fd9199b822a0f758521fe..73efc8ce4812257d8b86d9de76f3968fd63e33c1 100644

--- a/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc

+++ b/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc

@@ -9,8 +9,8 @@

#include "chrome/browser/infobars/infobar_service.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"

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

#include "chrome/grit/generated_resources.h"

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

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

#include "components/infobars/core/infobar.h"

#include "grit/theme_resources.h"

@@ -111,4 +111,3 @@ bool PopupBlockedInfoBarDelegate::Accept() {

return true;

}

« no previous file with comments | « chrome/browser/sessions/better_session_restore_browsertest.cc ('k') | chrome/browser/ui/browser.h » ('j') | components/components_tests.gyp » ('J')