chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc - Issue 2127883003: Move chooser_controller directory from //components to //chrome/browser

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/website_settings/chooser_bubble_ui_view.cc

Issue 2127883003: Move chooser_controller directory from //components to //chrome/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase again Created 4 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/views/extensions/chooser_dialog_view_browsertest.cc ('k') | chrome/browser/ui/website_settings/chooser_bubble_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc

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

index c60ae660302f7e754dfe68a13d893652d7b42a68..b247e107daa7bc6d2a54e95265cd14db016acb69 100644

--- a/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc

+++ b/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc

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

#include "base/macros.h"

#include "base/memory/ptr_util.h"

#include "base/strings/string16.h"

+#include "chrome/browser/chooser_controller/chooser_controller.h"

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

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/views/chooser_content_view.h"

@@ -22,7 +23,6 @@

#include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h"

#include "chrome/grit/generated_resources.h"

#include "components/bubble/bubble_controller.h"

-#include "components/chooser_controller/chooser_controller.h"

#include "components/url_formatter/elide_url.h"

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

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