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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/views/extensions/chooser_dialog_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 unified diff | Download patch

« no previous file with comments | « chrome/browser/ui/views/chooser_content_view_unittest.cc ('k') | chrome/browser/ui/views/extensions/chooser_dialog_view_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/views/extensions/chooser_dialog_view.h"	5 #include "chrome/browser/ui/views/extensions/chooser_dialog_view.h"

6	6

7 #include "base/strings/utf_string_conversions.h"	7 #include "base/strings/utf_string_conversions.h"

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

8 #include "chrome/browser/extensions/chrome_extension_chooser_dialog.h"	9 #include "chrome/browser/extensions/chrome_extension_chooser_dialog.h"

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

10 #include "chrome/grit/generated_resources.h"	11 #include "chrome/grit/generated_resources.h"

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

12 #include "components/constrained_window/constrained_window_views.h"	12 #include "components/constrained_window/constrained_window_views.h"

13 #include "components/url_formatter/elide_url.h"	13 #include "components/url_formatter/elide_url.h"

14 #include "components/web_modal/web_contents_modal_dialog_manager.h"	14 #include "components/web_modal/web_contents_modal_dialog_manager.h"

15 #include "content/public/browser/browser_thread.h"	15 #include "content/public/browser/browser_thread.h"

16 #include "extensions/browser/extension_registry.h"	16 #include "extensions/browser/extension_registry.h"

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

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

19 #include "ui/views/window/dialog_client_view.h"	19 #include "ui/views/window/dialog_client_view.h"

20	20

21 ChooserDialogView::ChooserDialogView(	21 ChooserDialogView::ChooserDialogView(

(...skipping 113 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
135 DCHECK(chooser_controller);	135 DCHECK(chooser_controller);

136	136

137 web_modal::WebContentsModalDialogManager* manager =	137 web_modal::WebContentsModalDialogManager* manager =

138 web_modal::WebContentsModalDialogManager::FromWebContents(web_contents_);	138 web_modal::WebContentsModalDialogManager::FromWebContents(web_contents_);

139 if (manager) {	139 if (manager) {

140 constrained_window::ShowWebModalDialogViews(	140 constrained_window::ShowWebModalDialogViews(

141 new ChooserDialogView(web_contents_, std::move(chooser_controller)),	141 new ChooserDialogView(web_contents_, std::move(chooser_controller)),

142 web_contents_);	142 web_contents_);

143 }	143 }

144 }	144 }

OLD	NEW