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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.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/options/chromeos/accounts_options_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h » ('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/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 "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 348 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
373 } else if (pairing.compare("bluetoothConfirmPasskey") == 0) {	374 } else if (pairing.compare("bluetoothConfirmPasskey") == 0) {

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

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

376 RequestPasskey(device);	377 RequestPasskey(device);

377 }	378 }

378 delete device;	379 delete device;

379 }	380 }

380	381

381 } // namespace chromeos	382 } // namespace chromeos

382	383

OLD	NEW