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

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

Issue 2122073004: Display extension name on device chooser title (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_chooser_controller_to_chrome_browser
Patch Set: removed unused variable 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
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/macros.h" 7 #include "base/macros.h"
8 #include "chrome/browser/chooser_controller/mock_chooser_controller.h" 8 #include "chrome/browser/chooser_controller/mock_chooser_controller.h"
9 #include "chrome/browser/extensions/extension_browsertest.h" 9 #include "chrome/browser/extensions/extension_browsertest.h"
10 #include "chrome/browser/platform_util.h" 10 #include "chrome/browser/platform_util.h"
11 #include "chrome/browser/ui/browser_window.h" 11 #include "chrome/browser/ui/browser_window.h"
12 #include "chrome/browser/ui/tabs/tab_strip_model.h"
13 #include "chrome/grit/generated_resources.h" 12 #include "chrome/grit/generated_resources.h"
14 #include "testing/gmock/include/gmock/gmock.h" 13 #include "testing/gmock/include/gmock/gmock.h"
15 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
16 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
17 #include "ui/gfx/range/range.h" 16 #include "ui/gfx/range/range.h"
18 #include "ui/views/controls/table/table_view.h" 17 #include "ui/views/controls/table/table_view.h"
19 #include "ui/views/widget/widget.h" 18 #include "ui/views/widget/widget.h"
20 #include "ui/views/window/dialog_client_view.h" 19 #include "ui/views/window/dialog_client_view.h"
21 20
22 class ChooserDialogViewTest : public ExtensionBrowserTest { 21 class ChooserDialogViewTest : public ExtensionBrowserTest {
23 public: 22 public:
24 ChooserDialogViewTest() {} 23 ChooserDialogViewTest() {}
25 ~ChooserDialogViewTest() override {} 24 ~ChooserDialogViewTest() override {}
26 25
27 void SetUpOnMainThread() override { 26 void SetUpOnMainThread() override {
28 content::WebContents* web_contents =
29 browser()->tab_strip_model()->GetWebContentsAt(0);
30 std::unique_ptr<MockChooserController> mock_chooser_controller( 27 std::unique_ptr<MockChooserController> mock_chooser_controller(
31 new MockChooserController(nullptr)); 28 new MockChooserController(nullptr));
32 mock_chooser_controller_ = mock_chooser_controller.get(); 29 mock_chooser_controller_ = mock_chooser_controller.get();
33 std::unique_ptr<ChooserDialogView> chooser_dialog_view( 30 std::unique_ptr<ChooserDialogView> chooser_dialog_view(
34 new ChooserDialogView(web_contents, 31 new ChooserDialogView(std::move(mock_chooser_controller)));
35 std::move(mock_chooser_controller)));
36 chooser_dialog_view_ = chooser_dialog_view.get(); 32 chooser_dialog_view_ = chooser_dialog_view.get();
37 table_view_ = chooser_dialog_view_->table_view_for_test(); 33 table_view_ = chooser_dialog_view_->table_view_for_test();
38 ASSERT_TRUE(table_view_); 34 ASSERT_TRUE(table_view_);
39 table_model_ = table_view_->model(); 35 table_model_ = table_view_->model();
40 ASSERT_TRUE(table_model_); 36 ASSERT_TRUE(table_model_);
41 views::Widget* modal_dialog = views::DialogDelegate::CreateDialogWidget( 37 views::Widget* modal_dialog = views::DialogDelegate::CreateDialogWidget(
42 chooser_dialog_view.release(), nullptr, 38 chooser_dialog_view.release(), nullptr,
43 platform_util::GetViewForWindow( 39 platform_util::GetViewForWindow(
44 browser()->window()->GetNativeWindow())); 40 browser()->window()->GetNativeWindow()));
45 modal_dialog->Show(); 41 modal_dialog->Show();
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 77
82 IN_PROC_BROWSER_TEST_F(ChooserDialogViewTest, Close) { 78 IN_PROC_BROWSER_TEST_F(ChooserDialogViewTest, Close) {
83 EXPECT_CALL(*mock_chooser_controller_, Close()).Times(1); 79 EXPECT_CALL(*mock_chooser_controller_, Close()).Times(1);
84 chooser_dialog_view_->Close(); 80 chooser_dialog_view_->Close();
85 } 81 }
86 82
87 IN_PROC_BROWSER_TEST_F(ChooserDialogViewTest, ClickStyledLabelLink) { 83 IN_PROC_BROWSER_TEST_F(ChooserDialogViewTest, ClickStyledLabelLink) {
88 EXPECT_CALL(*mock_chooser_controller_, OpenHelpCenterUrl()).Times(1); 84 EXPECT_CALL(*mock_chooser_controller_, OpenHelpCenterUrl()).Times(1);
89 chooser_dialog_view_->StyledLabelLinkClicked(nullptr, gfx::Range(), 0); 85 chooser_dialog_view_->StyledLabelLinkClicked(nullptr, gfx::Range(), 0);
90 } 86 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698