Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(919)

Unified Diff: chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc

Issue 9560005: [uber page] Merge advanced options page into browser options. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Rebase again. Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc
===================================================================
--- chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc (revision 124465)
+++ chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc (working copy)
@@ -136,13 +136,13 @@
}
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();
@@ -180,7 +180,7 @@
// 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(
@@ -267,7 +267,7 @@
js_properties.MergeDictionary(params);
}
web_ui()->CallJavascriptFunction(
- "options.AdvancedOptions.addBluetoothDevice",
+ "options.BrowserOptions.addBluetoothDevice",
js_properties);
}
« no previous file with comments | « chrome/browser/ui/webui/options2/browser_options_handler2.cc ('k') | chrome/browser/ui/webui/options2/options2_browsertest.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698