chrome/browser/ui/views/location_bar/content_setting_image_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/location_bar/content_setting_image_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:

Index: chrome/browser/ui/views/location_bar/content_setting_image_view.h

diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.h b/chrome/browser/ui/views/location_bar/content_setting_image_view.h

index 4bd97ee018f4f925843d5d8e614a06db4d6c85b6..f215960dfd4acd0ffd09c9a20413961fd1e95eaf 100644

--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.h

+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.h

@@ -6,7 +6,7 @@

#define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_

#include "base/memory/scoped_ptr.h"

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

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

#include "ui/gfx/animation/animation_delegate.h"

#include "ui/gfx/animation/slide_animation.h"

#include "ui/views/painter.h"