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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc

Issue 878253002: LocalizedValuesBuilder moved to components/login. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed dependency on 'base'. Created 5 years, 10 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
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 "chrome/grit/generated_resources.h"
20 #include "chromeos/chromeos_switches.h" 20 #include "chromeos/chromeos_switches.h"
21 #include "components/login/localized_values_builder.h"
21 #include "device/bluetooth/bluetooth_adapter_factory.h" 22 #include "device/bluetooth/bluetooth_adapter_factory.h"
22 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
23 24
24 namespace { 25 namespace {
25 26
26 const char kJsScreenPath[] = "login.HIDDetectionScreen"; 27 const char kJsScreenPath[] = "login.HIDDetectionScreen";
27 28
28 // Variants of pairing state. 29 // Variants of pairing state.
29 const char kRemotePinCode[] = "bluetoothRemotePinCode"; 30 const char kRemotePinCode[] = "bluetoothRemotePinCode";
30 const char kRemotePasskey[] = "bluetoothRemotePasskey"; 31 const char kRemotePasskey[] = "bluetoothRemotePasskey";
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 144
144 void HIDDetectionScreenHandler::CheckIsScreenRequired( 145 void HIDDetectionScreenHandler::CheckIsScreenRequired(
145 const base::Callback<void(bool)>& on_check_done) { 146 const base::Callback<void(bool)>& on_check_done) {
146 input_service_proxy_.GetDevices( 147 input_service_proxy_.GetDevices(
147 base::Bind(&HIDDetectionScreenHandler::OnGetInputDevicesListForCheck, 148 base::Bind(&HIDDetectionScreenHandler::OnGetInputDevicesListForCheck,
148 weak_ptr_factory_.GetWeakPtr(), 149 weak_ptr_factory_.GetWeakPtr(),
149 on_check_done)); 150 on_check_done));
150 } 151 }
151 152
152 void HIDDetectionScreenHandler::DeclareLocalizedValues( 153 void HIDDetectionScreenHandler::DeclareLocalizedValues(
153 LocalizedValuesBuilder* builder) { 154 ::login::LocalizedValuesBuilder* builder) {
154 builder->Add("hidDetectionContinue", IDS_HID_DETECTION_CONTINUE_BUTTON); 155 builder->Add("hidDetectionContinue", IDS_HID_DETECTION_CONTINUE_BUTTON);
155 builder->Add("hidDetectionInvitation", IDS_HID_DETECTION_INVITATION_TEXT); 156 builder->Add("hidDetectionInvitation", IDS_HID_DETECTION_INVITATION_TEXT);
156 builder->Add("hidDetectionPrerequisites", 157 builder->Add("hidDetectionPrerequisites",
157 IDS_HID_DETECTION_PRECONDITION_TEXT); 158 IDS_HID_DETECTION_PRECONDITION_TEXT);
158 builder->Add("hidDetectionMouseSearching", IDS_HID_DETECTION_SEARCHING_MOUSE); 159 builder->Add("hidDetectionMouseSearching", IDS_HID_DETECTION_SEARCHING_MOUSE);
159 builder->Add("hidDetectionKeyboardSearching", 160 builder->Add("hidDetectionKeyboardSearching",
160 IDS_HID_DETECTION_SEARCHING_KEYBOARD); 161 IDS_HID_DETECTION_SEARCHING_KEYBOARD);
161 builder->Add("hidDetectionUSBMouseConnected", 162 builder->Add("hidDetectionUSBMouseConnected",
162 IDS_HID_DETECTION_CONNECTED_USB_MOUSE); 163 IDS_HID_DETECTION_CONNECTED_USB_MOUSE);
163 builder->Add("hidDetectionUSBKeyboardConnected", 164 builder->Add("hidDetectionUSBKeyboardConnected",
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 l10n_util::GetStringFUTF16( 582 l10n_util::GetStringFUTF16(
582 IDS_HID_DETECTION_PAIRED_BLUETOOTH_KEYBOARD, 583 IDS_HID_DETECTION_PAIRED_BLUETOOTH_KEYBOARD,
583 base::UTF8ToUTF16(keyboard_device_name_))); 584 base::UTF8ToUTF16(keyboard_device_name_)));
584 } else { 585 } else {
585 state_info.SetString("state", kUSBConnectedState); 586 state_info.SetString("state", kUSBConnectedState);
586 } 587 }
587 CallJS("setKeyboardDeviceState", state_info); 588 CallJS("setKeyboardDeviceState", state_info);
588 } 589 }
589 590
590 } // namespace chromeos 591 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698