Index: chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc |
diff --git a/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc b/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc |
index 2ed20b135997fed89a4d21546c416618e06187e3..80f2725ea71cdad21ff9f3fca7b549effabff005 100644 |
--- a/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc |
+++ b/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc |
@@ -24,6 +24,7 @@ |
#include "chrome/browser/ui/website_settings/chooser_bubble_controller.h" |
#include "chrome/common/pref_names.h" |
#include "chrome/grit/generated_resources.h" |
+#include "components/chooser_controller/chooser_controller.h" |
#include "components/prefs/pref_service.h" |
#include "ui/accessibility/ax_view_state.h" |
#include "ui/base/l10n/l10n_util.h" |
@@ -65,7 +66,7 @@ class ChooserBubbleUiViewDelegate : public views::BubbleDialogDelegateView, |
public: |
ChooserBubbleUiViewDelegate(views::View* anchor_view, |
views::BubbleBorder::Arrow anchor_arrow, |
- ChooserBubbleController* controller); |
+ ChooserController* controller); |
~ChooserBubbleUiViewDelegate() override; |
// views::BubbleDialogDelegateView: |
@@ -99,7 +100,7 @@ class ChooserBubbleUiViewDelegate : public views::BubbleDialogDelegateView, |
ChooserTableModel* chooser_table_model() const; |
private: |
- ChooserBubbleController* controller_; |
+ ChooserController* controller_; |
views::TableView* table_view_; |
ChooserTableModel* chooser_table_model_; |
@@ -115,16 +116,16 @@ ui::TableColumn ChooserTableColumn(int id, const std::string& title) { |
} |
class ChooserTableModel : public ui::TableModel, |
- public ChooserBubbleController::Observer { |
+ public ChooserController::Observer { |
public: |
- explicit ChooserTableModel(ChooserBubbleController* controller); |
+ explicit ChooserTableModel(ChooserController* controller); |
// ui::TableModel: |
int RowCount() override; |
base::string16 GetText(int row, int column_id) override; |
void SetObserver(ui::TableModelObserver* observer) override; |
- // ChooserBubbleController::Observer: |
+ // ChooserController::Observer: |
void OnOptionsInitialized() override; |
void OnOptionAdded(size_t index) override; |
void OnOptionRemoved(size_t index) override; |
@@ -133,13 +134,13 @@ class ChooserTableModel : public ui::TableModel, |
private: |
ui::TableModelObserver* observer_; |
- ChooserBubbleController* controller_; |
+ ChooserController* controller_; |
}; |
ChooserBubbleUiViewDelegate::ChooserBubbleUiViewDelegate( |
views::View* anchor_view, |
views::BubbleBorder::Arrow anchor_arrow, |
- ChooserBubbleController* controller) |
+ ChooserController* controller) |
: views::BubbleDialogDelegateView(anchor_view, anchor_arrow), |
controller_(controller) { |
// ------------------------------------ |
@@ -271,7 +272,7 @@ ChooserTableModel* ChooserBubbleUiViewDelegate::chooser_table_model() const { |
return chooser_table_model_; |
} |
-ChooserTableModel::ChooserTableModel(ChooserBubbleController* controller) |
+ChooserTableModel::ChooserTableModel(ChooserController* controller) |
: observer_(nullptr), controller_(controller) { |
controller_->set_observer(this); |
} |
@@ -335,7 +336,7 @@ void ChooserTableModel::Update() { |
// ChooserBubbleUiView |
ChooserBubbleUiView::ChooserBubbleUiView(Browser* browser, |
- ChooserBubbleController* controller) |
+ ChooserController* controller) |
: browser_(browser), |
controller_(controller), |
chooser_bubble_ui_view_delegate_(nullptr) { |