Change ChooserController::Observer to ChooserController::View

chrome/browser/ui/bluetooth/bluetooth_chooser_controller.cc

 // Copyright 2015 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/bluetooth/bluetooth_chooser_controller.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/net/referrer.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 89 matching lines @@
     content::BluetoothChooser::AdapterPresence presence) {
   ClearAllDevices();
   switch (presence) {
     case content::BluetoothChooser::AdapterPresence::ABSENT:
       NOTREACHED();
       break;
     case content::BluetoothChooser::AdapterPresence::POWERED_OFF:
       no_devices_text_ =
           l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_ADAPTER_OFF);
       status_text_ = base::string16();
-      if (observer())
-        observer()->OnAdapterEnabledChanged(
+      if (view())

[msw, 2016/07/20 20:37:07]

nit: for each of these multi-line conditional blocks; please add curly braces,
or change the comment pattern to something like:
  // Notify the view that the Bluetooth adapter is turned off.
  if (view())
    view()->OnAdapterEnabledChanged(false);
(or just remove the comments; the code is fairly self-evident)

[juncai, 2016/07/20 22:37:45]

Done.

+        view()->OnAdapterEnabledChanged(
             false /* Bluetooth adapter is turned off */);
       break;
     case content::BluetoothChooser::AdapterPresence::POWERED_ON:
       no_devices_text_ =
           l10n_util::GetStringUTF16(IDS_DEVICE_CHOOSER_NO_DEVICES_FOUND_PROMPT);
       status_text_ =
           l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_RE_SCAN);
-      if (observer())
-        observer()->OnAdapterEnabledChanged(
+      if (view())
+        view()->OnAdapterEnabledChanged(
             true /* Bluetooth adapter is turned on */);
       break;
   }
 }
 
 void BluetoothChooserController::OnDiscoveryStateChanged(
     content::BluetoothChooser::DiscoveryState state) {
   switch (state) {
     case content::BluetoothChooser::DiscoveryState::DISCOVERING:
       status_text_ =
           l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_SCANNING);
-      if (observer())
-        observer()->OnRefreshStateChanged(
+      if (view())
+        view()->OnRefreshStateChanged(
             true /* Refreshing options is in progress */);
       break;
     case content::BluetoothChooser::DiscoveryState::IDLE:
     case content::BluetoothChooser::DiscoveryState::FAILED_TO_START:
       status_text_ =
           l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_RE_SCAN);
-      if (observer())
-        observer()->OnRefreshStateChanged(
+      if (view())
+        view()->OnRefreshStateChanged(
             false /* Refreshing options is complete */);
       break;
   }
 }
 
 void BluetoothChooserController::AddDevice(const std::string& device_id,
                                            const base::string16& device_name) {
   device_names_and_ids_.push_back(std::make_pair(device_name, device_id));
   ++device_name_map_[device_name];
-  if (observer())
-    observer()->OnOptionAdded(device_names_and_ids_.size() - 1);
+  if (view())
+    view()->OnOptionAdded(device_names_and_ids_.size() - 1);
 }
 
 void BluetoothChooserController::RemoveDevice(const std::string& device_id) {
   for (auto it = device_names_and_ids_.begin();
        it != device_names_and_ids_.end(); ++it) {
     if (it->second == device_id) {
       size_t index = it - device_names_and_ids_.begin();
       DCHECK_GT(device_name_map_[it->first], 0);
       if (--device_name_map_[it->first] == 0)
         device_name_map_.erase(it->first);
       device_names_and_ids_.erase(it);
-      if (observer())
-        observer()->OnOptionRemoved(index);
+      if (view())
+        view()->OnOptionRemoved(index);
       return;
     }
   }
 }
 
 void BluetoothChooserController::ClearAllDevices() {
   device_names_and_ids_.clear();
   device_name_map_.clear();
 }