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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc

Issue 8937011: Revert "Options2: Pull the trigger." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h" 5 #include "chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h" 11 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
12 #include "chrome/browser/chromeos/system/runtime_environment.h" 12 #include "chrome/browser/chromeos/system/runtime_environment.h"
13 #include "chrome/browser/ui/webui/options/chromeos/system_settings_provider.h" 13 #include "chrome/browser/ui/webui/options/chromeos/system_settings_provider.h"
14 #include "chrome/common/chrome_switches.h" 14 #include "chrome/common/chrome_switches.h"
15 #include "grit/chromium_strings.h" 15 #include "grit/chromium_strings.h"
16 #include "grit/generated_resources.h" 16 #include "grit/generated_resources.h"
17 #include "third_party/cros_system_api/dbus/service_constants.h" 17 #include "third_party/cros_system_api/dbus/service_constants.h"
18 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
19 19
20 namespace { 20 namespace {
21 21
22 // |UpdateDeviceCallback| takes a variable length list as an argument. The 22 // |UpdateDeviceCallback| takes a variable length list as an arugment. The
23 // value stored in each list element is indicated by the following constants. 23 // value stored in each list element is indicated by the following constants.
24 const int kUpdateDeviceAddressIndex = 0; 24 const int kUpdateDeviceAddressIndex = 0;
25 const int kUpdateDeviceCommandIndex = 1; 25 const int kUpdateDeviceCommandIndex = 1;
26 const int kUpdateDevicePasskeyIndex = 2; 26 const int kUpdateDevicePasskeyIndex = 2;
27 27
28 } // namespace 28 } // namespace
29 29
30 namespace chromeos { 30 namespace chromeos {
31 31
32 BluetoothOptionsHandler::BluetoothOptionsHandler() { 32 BluetoothOptionsHandler::BluetoothOptionsHandler() {
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 } else if (pairing.compare("bluetoothConfirmPasskey") == 0) { 402 } else if (pairing.compare("bluetoothConfirmPasskey") == 0) {
403 RequestConfirmation(device, 12345); 403 RequestConfirmation(device, 12345);
404 } else if (pairing.compare("bluetoothEnterPasskey") == 0) { 404 } else if (pairing.compare("bluetoothEnterPasskey") == 0) {
405 RequestPasskey(device); 405 RequestPasskey(device);
406 } 406 }
407 delete device; 407 delete device;
408 } 408 }
409 409
410 } // namespace chromeos 410 } // namespace chromeos
411 411
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chrome_web_ui_factory.cc ('k') | chrome/browser/ui/webui/options/options_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698