Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: chrome/browser/ui/views/extensions/chooser_dialog_view.cc

Issue 2171103002: Add test for WebBluetooth chooser spinner, status text and rescan button (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 4 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
OLDNEW
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/chooser_controller/chooser_controller.h"
9 #include "chrome/browser/extensions/chrome_extension_chooser_dialog.h" 9 #include "chrome/browser/extensions/chrome_extension_chooser_dialog.h"
10 #include "chrome/browser/ui/views/chooser_content_view.h" 10 #include "chrome/browser/ui/views/chooser_content_view.h"
11 #include "chrome/grit/generated_resources.h" 11 #include "chrome/grit/generated_resources.h"
12 #include "components/constrained_window/constrained_window_views.h" 12 #include "components/constrained_window/constrained_window_views.h"
13 #include "components/web_modal/web_contents_modal_dialog_manager.h" 13 #include "components/web_modal/web_contents_modal_dialog_manager.h"
14 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
15 #include "ui/views/controls/link.h"
15 #include "ui/views/controls/styled_label.h" 16 #include "ui/views/controls/styled_label.h"
16 #include "ui/views/window/dialog_client_view.h" 17 #include "ui/views/window/dialog_client_view.h"
17 18
18 ChooserDialogView::ChooserDialogView( 19 ChooserDialogView::ChooserDialogView(
19 std::unique_ptr<ChooserController> chooser_controller) { 20 std::unique_ptr<ChooserController> chooser_controller) {
20 // ------------------------------------ 21 // ------------------------------------
21 // | Chooser dialog title | 22 // | Chooser dialog title |
22 // | -------------------------------- | 23 // | -------------------------------- |
23 // | | option 0 | | 24 // | | option 0 | |
24 // | | option 1 | | 25 // | | option 1 | |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 109 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
109 DCHECK(chooser_controller); 110 DCHECK(chooser_controller);
110 111
111 web_modal::WebContentsModalDialogManager* manager = 112 web_modal::WebContentsModalDialogManager* manager =
112 web_modal::WebContentsModalDialogManager::FromWebContents(web_contents_); 113 web_modal::WebContentsModalDialogManager::FromWebContents(web_contents_);
113 if (manager) { 114 if (manager) {
114 constrained_window::ShowWebModalDialogViews( 115 constrained_window::ShowWebModalDialogViews(
115 new ChooserDialogView(std::move(chooser_controller)), web_contents_); 116 new ChooserDialogView(std::move(chooser_controller)), web_contents_);
116 } 117 }
117 } 118 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698