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

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

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 3 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
OLDNEW
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 "chrome/grit/generated_resources.h"
14 #include "content/public/browser/web_ui.h" 15 #include "content/public/browser/web_ui.h"
15 #include "device/bluetooth/bluetooth_adapter.h" 16 #include "device/bluetooth/bluetooth_adapter.h"
16 #include "device/bluetooth/bluetooth_adapter_factory.h" 17 #include "device/bluetooth/bluetooth_adapter_factory.h"
17 #include "device/bluetooth/bluetooth_device.h" 18 #include "device/bluetooth/bluetooth_device.h"
18 #include "grit/generated_resources.h"
19 #include "third_party/cros_system_api/dbus/service_constants.h" 19 #include "third_party/cros_system_api/dbus/service_constants.h"
20 20
21 namespace { 21 namespace {
22 22
23 // |UpdateDeviceCallback| takes a variable length list as an argument. The 23 // |UpdateDeviceCallback| takes a variable length list as an argument. The
24 // 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.
25 const int kUpdateDeviceAddressIndex = 0; 25 const int kUpdateDeviceAddressIndex = 0;
26 const int kUpdateDeviceCommandIndex = 1; 26 const int kUpdateDeviceCommandIndex = 1;
27 const int kUpdateDeviceAuthTokenIndex = 2; 27 const int kUpdateDeviceAuthTokenIndex = 2;
28 28
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 void BluetoothOptionsHandler::DeviceConnecting( 596 void BluetoothOptionsHandler::DeviceConnecting(
597 device::BluetoothDevice* device) { 597 device::BluetoothDevice* device) {
598 DCHECK(device); 598 DCHECK(device);
599 base::DictionaryValue params; 599 base::DictionaryValue params;
600 params.SetString("pairing", kStartConnecting); 600 params.SetString("pairing", kStartConnecting);
601 SendDeviceNotification(device, &params); 601 SendDeviceNotification(device, &params);
602 } 602 }
603 603
604 } // namespace options 604 } // namespace options
605 } // namespace chromeos 605 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698