chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc - Issue 468233004: Cleanup: Another round of removing unneeded grit #includes in chrome.

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

Issue 468233004: Cleanup: Another round of removing unneeded grit #includes in chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix mac, undo ui_localizer.mm Created 6 years, 4 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/net_internals/net_internals_ui.cc ('k') | chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc » ('j') | no next file with comments »
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/bind_helpers.h"	8 #include "base/bind_helpers.h"

9 #include "base/callback.h"	9 #include "base/callback.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "base/strings/string_number_conversions.h"	11 #include "base/strings/string_number_conversions.h"

12 #include "base/strings/utf_string_conversions.h"	12 #include "base/strings/utf_string_conversions.h"

13 #include "base/values.h"	13 #include "base/values.h"

14 #include "content/public/browser/web_ui.h"	14 #include "content/public/browser/web_ui.h"

15 #include "device/bluetooth/bluetooth_adapter.h"	15 #include "device/bluetooth/bluetooth_adapter.h"

16 #include "device/bluetooth/bluetooth_adapter_factory.h"	16 #include "device/bluetooth/bluetooth_adapter_factory.h"

17 #include "device/bluetooth/bluetooth_device.h"	17 #include "device/bluetooth/bluetooth_device.h"

18 #include "grit/chromium_strings.h"

19 #include "grit/generated_resources.h"	18 #include "grit/generated_resources.h"

20 #include "third_party/cros_system_api/dbus/service_constants.h"	19 #include "third_party/cros_system_api/dbus/service_constants.h"

21	20

22 namespace {	21 namespace {

23	22

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

25 // 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.

26 const int kUpdateDeviceAddressIndex = 0;	25 const int kUpdateDeviceAddressIndex = 0;

27 const int kUpdateDeviceCommandIndex = 1;	26 const int kUpdateDeviceCommandIndex = 1;

28 const int kUpdateDeviceAuthTokenIndex = 2;	27 const int kUpdateDeviceAuthTokenIndex = 2;

(...skipping 568 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
597 void BluetoothOptionsHandler::DeviceConnecting(	596 void BluetoothOptionsHandler::DeviceConnecting(

598 device::BluetoothDevice* device) {	597 device::BluetoothDevice* device) {

599 DCHECK(device);	598 DCHECK(device);

600 base::DictionaryValue params;	599 base::DictionaryValue params;

601 params.SetString("pairing", kStartConnecting);	600 params.SetString("pairing", kStartConnecting);

602 SendDeviceNotification(device, &params);	601 SendDeviceNotification(device, &params);

603 }	602 }

604	603

605 } // namespace options	604 } // namespace options

606 } // namespace chromeos	605 } // namespace chromeos

OLD	NEW