chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc - Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership...

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

Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: sync to head to clear linux_chromeos browsertest failures Created 8 years, 11 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/webui/options2/chromeos/accounts_options_handler2.cc ('k') | chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler2.cc » ('j') | content/browser/tab_contents/render_view_host_manager_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/options2/chromeos/bluetooth_options_handler2.h "	5 #include "chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.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/options2/chromeos/system_settings_provider2.h"	13 #include "chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.h"

14 #include "chrome/common/chrome_switches.h"	14 #include "chrome/common/chrome_switches.h"

	15 #include "content/browser/webui/web_ui.h"

15 #include "grit/chromium_strings.h"	16 #include "grit/chromium_strings.h"

16 #include "grit/generated_resources.h"	17 #include "grit/generated_resources.h"

17 #include "third_party/cros_system_api/dbus/service_constants.h"	18 #include "third_party/cros_system_api/dbus/service_constants.h"

18 #include "ui/base/l10n/l10n_util.h"	19 #include "ui/base/l10n/l10n_util.h"

19	20

20 namespace {	21 namespace {

21	22

22 // \|UpdateDeviceCallback\| takes a variable length list as an argument. The	23 // \|UpdateDeviceCallback\| takes a variable length list as an argument. The

23 // value stored in each list element is indicated by the following constants.	24 // value stored in each list element is indicated by the following constants.

24 const int kUpdateDeviceAddressIndex = 0;	25 const int kUpdateDeviceAddressIndex = 0;

(...skipping 349 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
374 } else if (pairing.compare("bluetoothConfirmPasskey") == 0) {	375 } else if (pairing.compare("bluetoothConfirmPasskey") == 0) {

375 RequestConfirmation(device, 12345);	376 RequestConfirmation(device, 12345);

376 } else if (pairing.compare("bluetoothEnterPasskey") == 0) {	377 } else if (pairing.compare("bluetoothEnterPasskey") == 0) {

377 RequestPasskey(device);	378 RequestPasskey(device);

378 }	379 }

379 delete device;	380 delete device;

380 }	381 }

381	382

382 } // namespace options2	383 } // namespace options2

383 } // namespace chromeos	384 } // namespace chromeos

OLD	NEW