Bluetooth UI update.

chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc

 // Copyright (c) 2011 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/webui/options/chromeos/bluetooth_options_handler.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 32 matching lines @@
 
   bluetooth_manager->RemoveObserver(this);
 }
 
 void BluetoothOptionsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   localized_strings->SetString("bluetooth",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SECTION_TITLE_BLUETOOTH));
+  localized_strings->SetString("disableBluetooth",
+      l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_BLUETOOTH_DISABLE));
   localized_strings->SetString("enableBluetooth",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_BLUETOOTH_ENABLE));
+  localized_strings->SetString("noBluetoothDevicesFound",
+      l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_NO_BLUETOOTH_DEVICES_FOUND));
   localized_strings->SetString("findBluetoothDevices",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_FIND_BLUETOOTH_DEVICES));
   localized_strings->SetString("bluetoothScanning",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_BLUETOOTH_SCANNING));
   localized_strings->SetString("bluetoothDeviceConnected",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECTED));
   localized_strings->SetString("bluetoothDeviceConnecting",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECTING));
   localized_strings->SetString("bluetoothDeviceNotPaired",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_BLUETOOTH_NOT_PAIRED));
@@ skipping 29 matching lines @@
   // explicitly enabled via a command line flag.
   if (!CommandLine::ForCurrentProcess()
       ->HasSwitch(switches::kEnableBluetooth)) {
     return;
   }
 
   web_ui_->CallJavascriptFunction(
       "options.SystemOptions.showBluetoothSettings");
 
   // TODO(kevers): Determine whether bluetooth adapter is powered.
-  bool bluetooth_on = true;
+  bool bluetooth_on = false;
   base::FundamentalValue checked(bluetooth_on);
   web_ui_->CallJavascriptFunction(
-      "options.SystemOptions.setBluetoothCheckboxState", checked);
+      "options.SystemOptions.setBluetoothState", checked);
 
   chromeos::BluetoothManager* bluetooth_manager =
       chromeos::BluetoothManager::GetInstance();
   DCHECK(bluetooth_manager);
   bluetooth_manager->AddObserver(this);
 
   chromeos::BluetoothAdapter* default_adapter =
       bluetooth_manager->DefaultAdapter();
   DefaultAdapterChanged(default_adapter);
 }
@@ skipping 11 matching lines @@
                  base::Unretained(this)));
 }
 
 void BluetoothOptionsHandler::EnableChangeCallback(
     const ListValue* args) {
   bool bluetooth_enabled;
   args->GetBoolean(0, &bluetooth_enabled);
   // TODO(kevers): Call Bluetooth API to enable or disable.
   base::FundamentalValue checked(bluetooth_enabled);
   web_ui_->CallJavascriptFunction(
-      "options.SystemOptions.setBluetoothCheckboxState", checked);
+      "options.SystemOptions.setBluetoothState", checked);
 }
 
 void BluetoothOptionsHandler::FindDevicesCallback(
     const ListValue* args) {
   // We only initiate a scan if we're running on Chrome OS. Otherwise, we
   // generate a fake device list.
   if (!chromeos::system::runtime_environment::IsRunningOnChromeOS()) {
     GenerateFakeDeviceList();
     return;
   }
@@ skipping 144 matching lines @@
   if ((adapter == NULL && !default_adapter_id_.empty()) ||
       (adapter != NULL && default_adapter_id_ != adapter->Id())) {
     VLOG(1) << "unexpected default adapter change from \""
             << default_adapter_id_ << "\" to \"" << adapter->Id() << "\"";
     DefaultAdapterChanged(adapter);
   }
 }
 
 void BluetoothOptionsHandler::GenerateFakeDeviceList() {
   GenerateFakeDevice(
-
     "Fake Wireless Keyboard",
     "01-02-03-04-05-06",
     "input-keyboard",
     true,
     true,
     "");
   GenerateFakeDevice(
     "Fake Wireless Mouse",
     "02-03-04-05-06-01",
     "input-mouse",
@@ skipping 21 matching lines @@
     false,
     false,
     "bluetoothConfirmPasskey");
   GenerateFakeDevice(
     "Fake Connecting Headset",
     "06-01-02-03-04-05",
     "headset",
     false,
     false,
     "bluetoothEnterPasskey");
-
   web_ui_->CallJavascriptFunction(
       "options.SystemOptions.notifyBluetoothSearchComplete");
 }
 
 void BluetoothOptionsHandler::GenerateFakeDevice(
     const std::string& name,
     const std::string& address,
     const std::string& icon,
     bool paired,
     bool connected,
@@ skipping 13 matching lines @@
   } else if (pairing.compare("bluetoothConfirmPasskey") == 0) {
     RequestConfirmation(device, 12345);
   } else if (pairing.compare("bluetoothEnterPasskey") == 0) {
     RequestPasskey(device);
   }
   delete device;
 }
 
 }  // namespace chromeos