Change ChooserController::Observer to ChooserController::View

chrome/browser/ui/views/chooser_content_view.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/chooser_content_view.h"
 
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/controls/throbber.h"
 #include "ui/views/layout/fill_layout.h"
 
 namespace {
 
 const int kChooserWidth = 330;
 
 const int kChooserHeight = 220;
 
 const int kThrobberDiameter = 50;
 
 }  // namespace
 
 ChooserContentView::ChooserContentView(
     views::TableViewObserver* table_view_observer,
     std::unique_ptr<ChooserController> chooser_controller)
     : chooser_controller_(std::move(chooser_controller)) {
-  chooser_controller_->set_observer(this);
+  chooser_controller_->set_view(this);
   std::vector<ui::TableColumn> table_columns;
   table_columns.push_back(ui::TableColumn());
   table_view_ =
       new views::TableView(this, table_columns, views::TEXT_ONLY, true);
   table_view_->set_select_on_remove(false);
   table_view_->SetObserver(table_view_observer);
   table_view_->SetEnabled(chooser_controller_->NumOptions() > 0);
 
   SetLayoutManager(new views::FillLayout());
   views::View* table_parent = table_view_->CreateParentIfNecessary();
   AddChildView(table_parent);
 
   throbber_ = new views::Throbber();
   // Set the throbber in the center of the chooser.
   throbber_->SetBounds((kChooserWidth - kThrobberDiameter) / 2,
                        (kChooserHeight - kThrobberDiameter) / 2,
                        kThrobberDiameter, kThrobberDiameter);
   throbber_->SetVisible(false);
   AddChildView(throbber_);
 }
 
 ChooserContentView::~ChooserContentView() {
-  chooser_controller_->set_observer(nullptr);
+  chooser_controller_->set_view(nullptr);
   table_view_->SetObserver(nullptr);
   table_view_->SetModel(nullptr);
   if (discovery_state_)
     discovery_state_->set_listener(nullptr);
 }
 
 gfx::Size ChooserContentView::GetPreferredSize() const {
   return gfx::Size(kChooserWidth, kChooserHeight);
 }
 
@@ skipping 129 matching lines @@
 }
 
 void ChooserContentView::UpdateTableView() {
   if (chooser_controller_->NumOptions() == 0) {
     table_view_->OnModelChanged();
     table_view_->SetEnabled(false);
   } else {
     table_view_->SetEnabled(true);
   }
 }