chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm - 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/cocoa/website_settings/chooser_bubble_ui_cocoa.mm

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/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm ('k') | chrome/browser/ui/views/browser_dialogs_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm

diff --git a/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm b/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm

index 0e80e0d19bfa1eb8b6984e49bc66070689647888..2e89087ac1fa2b2ac0c008991258c15b91d1ba3b 100644

--- a/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm

+++ b/chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm

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

#include "base/mac/scoped_nsobject.h"

#include "base/memory/ptr_util.h"

#include "base/strings/utf_string_conversions.h"

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

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

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

#import "chrome/browser/ui/cocoa/base_bubble_controller.h"

@@ -24,7 +25,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 "content/public/browser/native_web_keyboard_event.h"

#include "ui/base/cocoa/cocoa_base_utils.h"