[uber page] Merge advanced options page into browser options.

chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc

 // Copyright (c) 2012 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/options2/chromeos/bluetooth_options_handler2.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 118 matching lines @@
 
 void BluetoothOptionsHandler::Initialize() {
   // Bluetooth support is a work in progress.  Supress the feature unless
   // explicitly enabled via a command line flag.
   if (!CommandLine::ForCurrentProcess()
       ->HasSwitch(switches::kEnableBluetooth)) {
     return;
   }
 
   web_ui()->CallJavascriptFunction(
-      "options.AdvancedOptions.showBluetoothSettings");
+      "options.BrowserOptions.showBluetoothSettings");
 
   // TODO(kevers): Determine whether bluetooth adapter is powered.
   bool bluetooth_on = false;
   base::FundamentalValue checked(bluetooth_on);
   web_ui()->CallJavascriptFunction(
-      "options.AdvancedOptions.setBluetoothState", checked);
+      "options.BrowserOptions.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 17 matching lines @@
 
 }
 
 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.AdvancedOptions.setBluetoothState", checked);
+      "options.BrowserOptions.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 66 matching lines @@
   base::DictionaryValue js_properties;
   js_properties.SetString("name", device->GetName());
   js_properties.SetString("address", device->GetAddress());
   js_properties.SetString("icon", device->GetIcon());
   js_properties.SetBoolean("paired", device->IsPaired());
   js_properties.SetBoolean("connected", device->IsConnected());
   if (params) {
     js_properties.MergeDictionary(params);
   }
   web_ui()->CallJavascriptFunction(
-      "options.AdvancedOptions.addBluetoothDevice",
+      "options.BrowserOptions.addBluetoothDevice",
       js_properties);
 }
 
 void BluetoothOptionsHandler::RequestConfirmation(
     chromeos::BluetoothDevice* device,
     int passkey) {
   DictionaryValue params;
   params.SetString("pairing", "bluetoothConfirmPasskey");
   params.SetInteger("passkey", passkey);
   SendDeviceNotification(device, &params);
@@ skipping 133 matching lines @@
     // Sending an error notification.
     DictionaryValue params;
     params.SetString("pairing", pairing);
     SendDeviceNotification(device, &params);
   }
   delete device;
 }
 
 }  // namespace options2
 }  // namespace chromeos