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

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

Issue 2746313002: Remove RenderFrameHost pointer from ChooserController. (Closed)
Patch Set: Fix Android build and juncai@ comment. Created 3 years, 9 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 <memory> 7 #include <memory>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 12 matching lines...) Expand all
23 #include "ui/views/window/dialog_client_view.h" 23 #include "ui/views/window/dialog_client_view.h"
24 24
25 class ChooserDialogViewTest : public views::ViewsTestBase { 25 class ChooserDialogViewTest : public views::ViewsTestBase {
26 public: 26 public:
27 ChooserDialogViewTest() {} 27 ChooserDialogViewTest() {}
28 ~ChooserDialogViewTest() override {} 28 ~ChooserDialogViewTest() override {}
29 29
30 // views::ViewsTestBase: 30 // views::ViewsTestBase:
31 void SetUp() override { 31 void SetUp() override {
32 views::ViewsTestBase::SetUp(); 32 views::ViewsTestBase::SetUp();
33 std::unique_ptr<MockChooserController> mock_chooser_controller( 33 auto mock_chooser_controller = base::MakeUnique<MockChooserController>();
34 new MockChooserController(nullptr));
35 mock_chooser_controller_ = mock_chooser_controller.get(); 34 mock_chooser_controller_ = mock_chooser_controller.get();
36 std::unique_ptr<ChooserDialogView> chooser_dialog_view( 35 std::unique_ptr<ChooserDialogView> chooser_dialog_view(
37 new ChooserDialogView(std::move(mock_chooser_controller))); 36 new ChooserDialogView(std::move(mock_chooser_controller)));
38 chooser_dialog_view_ = chooser_dialog_view.get(); 37 chooser_dialog_view_ = chooser_dialog_view.get();
39 table_view_ = chooser_dialog_view_->device_chooser_content_view_for_test() 38 table_view_ = chooser_dialog_view_->device_chooser_content_view_for_test()
40 ->table_view_; 39 ->table_view_;
41 ASSERT_TRUE(table_view_); 40 ASSERT_TRUE(table_view_);
42 41
43 views::Widget::InitParams params = 42 views::Widget::InitParams params =
44 CreateParams(views::Widget::InitParams::TYPE_WINDOW); 43 CreateParams(views::Widget::InitParams::TYPE_WINDOW);
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 EXPECT_TRUE(cancel_button_->enabled()); 383 EXPECT_TRUE(cancel_button_->enabled());
385 table_view_->Select(0); 384 table_view_->Select(0);
386 EXPECT_TRUE(ok_button_->enabled()); 385 EXPECT_TRUE(ok_button_->enabled());
387 EXPECT_TRUE(cancel_button_->enabled()); 386 EXPECT_TRUE(cancel_button_->enabled());
388 387
389 mock_chooser_controller_->OnDiscoveryStateChanged( 388 mock_chooser_controller_->OnDiscoveryStateChanged(
390 content::BluetoothChooser::DiscoveryState::IDLE); 389 content::BluetoothChooser::DiscoveryState::IDLE);
391 EXPECT_TRUE(ok_button_->enabled()); 390 EXPECT_TRUE(ok_button_->enabled());
392 EXPECT_TRUE(cancel_button_->enabled()); 391 EXPECT_TRUE(cancel_button_->enabled());
393 } 392 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/device_chooser_content_view_unittest.cc ('k') | chrome/browser/usb/usb_chooser_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698