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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/hid_detection_screen_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/chromeos/login/hid_detection_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_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/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
13 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
17 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 17 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
18 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
19 #include "chrome/grit/generated_resources.h"
19 #include "chromeos/chromeos_switches.h" 20 #include "chromeos/chromeos_switches.h"
20 #include "device/bluetooth/bluetooth_adapter_factory.h" 21 #include "device/bluetooth/bluetooth_adapter_factory.h"
21 #include "grit/generated_resources.h"
22 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
23 23
24 namespace { 24 namespace {
25 25
26 const char kJsScreenPath[] = "login.HIDDetectionScreen"; 26 const char kJsScreenPath[] = "login.HIDDetectionScreen";
27 27
28 // Variants of pairing state. 28 // Variants of pairing state.
29 const char kRemotePinCode[] = "bluetoothRemotePinCode"; 29 const char kRemotePinCode[] = "bluetoothRemotePinCode";
30 const char kRemotePasskey[] = "bluetoothRemotePasskey"; 30 const char kRemotePasskey[] = "bluetoothRemotePasskey";
31 31
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 l10n_util::GetStringFUTF16( 582 l10n_util::GetStringFUTF16(
583 IDS_HID_DETECTION_PAIRED_BLUETOOTH_KEYBOARD, 583 IDS_HID_DETECTION_PAIRED_BLUETOOTH_KEYBOARD,
584 base::UTF8ToUTF16(keyboard_device_name_))); 584 base::UTF8ToUTF16(keyboard_device_name_)));
585 } else { 585 } else {
586 state_info.SetString("state", kUSBConnectedState); 586 state_info.SetString("state", kUSBConnectedState);
587 } 587 }
588 CallJS("setKeyboardDeviceState", state_info); 588 CallJS("setKeyboardDeviceState", state_info);
589 } 589 }
590 590
591 } // namespace chromeos 591 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698