| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/translate/translate_bubble_view.h" | 5 #include "chrome/browser/ui/views/translate/translate_bubble_view.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "chrome/browser/ui/translate/translate_bubble_model.h" | 10 #include "chrome/browser/ui/translate/translate_bubble_model.h" |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 anchor_widget_.reset(new views::Widget()); | 140 anchor_widget_.reset(new views::Widget()); |
| 141 anchor_widget_->Init(params); | 141 anchor_widget_->Init(params); |
| 142 anchor_widget_->Show(); | 142 anchor_widget_->Show(); |
| 143 | 143 |
| 144 mock_model_ = new MockTranslateBubbleModel( | 144 mock_model_ = new MockTranslateBubbleModel( |
| 145 TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE); | 145 TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE); |
| 146 scoped_ptr<TranslateBubbleModel> model(mock_model_); | 146 scoped_ptr<TranslateBubbleModel> model(mock_model_); |
| 147 bubble_ = new TranslateBubbleView(anchor_widget_->GetContentsView(), | 147 bubble_ = new TranslateBubbleView(anchor_widget_->GetContentsView(), |
| 148 std::move(model), | 148 std::move(model), |
| 149 translate::TranslateErrors::NONE, NULL); | 149 translate::TranslateErrors::NONE, NULL); |
| 150 views::BubbleDelegateView::CreateBubble(bubble_)->Show(); | 150 views::BubbleDialogDelegateView::CreateBubble(bubble_)->Show(); |
| 151 } | 151 } |
| 152 | 152 |
| 153 void TearDown() override { | 153 void TearDown() override { |
| 154 bubble_->GetWidget()->CloseNow(); | 154 bubble_->GetWidget()->CloseNow(); |
| 155 anchor_widget_.reset(); | 155 anchor_widget_.reset(); |
| 156 | 156 |
| 157 views::ViewsTestBase::TearDown(); | 157 views::ViewsTestBase::TearDown(); |
| 158 } | 158 } |
| 159 | 159 |
| 160 views::Combobox* denial_combobox() { return bubble_->denial_combobox_; } | 160 views::Combobox* denial_combobox() { return bubble_->denial_combobox_; } |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 | 354 |
| 355 TEST_F(TranslateBubbleViewTest, CancelButtonReturningError) { | 355 TEST_F(TranslateBubbleViewTest, CancelButtonReturningError) { |
| 356 bubble_->SwitchView(TranslateBubbleModel::VIEW_STATE_ERROR); | 356 bubble_->SwitchView(TranslateBubbleModel::VIEW_STATE_ERROR); |
| 357 bubble_->SwitchView(TranslateBubbleModel::VIEW_STATE_ADVANCED); | 357 bubble_->SwitchView(TranslateBubbleModel::VIEW_STATE_ADVANCED); |
| 358 | 358 |
| 359 // Click the "Cancel" button to go back. | 359 // Click the "Cancel" button to go back. |
| 360 EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_ADVANCED, bubble_->GetViewState()); | 360 EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_ADVANCED, bubble_->GetViewState()); |
| 361 bubble_->HandleButtonPressed(TranslateBubbleView::BUTTON_ID_CANCEL); | 361 bubble_->HandleButtonPressed(TranslateBubbleView::BUTTON_ID_CANCEL); |
| 362 EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_ERROR, bubble_->GetViewState()); | 362 EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_ERROR, bubble_->GetViewState()); |
| 363 } | 363 } |
| OLD | NEW |