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

Index: chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h

diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h b/chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h

index 1b1709bfcfe9f9fb9b4859e90ca32c41e4c0bd15..058e8ad9687689a54f7c0132d74fcc13e551f4fc 100644

--- a/chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h

+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h

@@ -5,7 +5,7 @@

#ifndef CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_DELEGATE_H_

#define CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_DELEGATE_H_

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

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

namespace content {

class WebContents;