chrome/browser/ui/views/content_setting_bubble_contents.cc - Issue 8687031: views: Move the remaining files to ui/views/controls/.

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/content_setting_bubble_contents.cc

Issue 8687031: views: Move the remaining files to ui/views/controls/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 1 month 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/content_setting_bubble_contents.cc

diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc

index 41483ba326e9fc4b98b395e48a2d7535c1d95290..993cb292bf48907cf1ad01d4889d8a633fac49f4 100644

--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc

+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc

@@ -26,12 +26,12 @@

#include "ui/base/l10n/l10n_util.h"

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

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

+#include "ui/views/controls/image_view.h"

#include "ui/views/controls/label.h"

#include "ui/views/controls/link.h"

+#include "ui/views/controls/separator.h"

#include "ui/views/layout/grid_layout.h"

#include "ui/views/layout/layout_constants.h"

-#include "views/controls/image_view.h"

-#include "views/controls/separator.h"

#if defined(TOOLKIT_USES_GTK)

#include "ui/gfx/gtk_util.h"