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

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

Issue 561903002: Remove implicit conversions from scoped_refptr to T* in c/b/ui/webui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove dumb change 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc
index 3accce1187aa5f150d46cbe8ff24da4cca4102ff..55484ddb893352c07e8bf18af15b2a02e6a2a74e 100644
--- a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc
@@ -203,7 +203,7 @@ void HIDDetectionScreenHandler::HandleOnContinue() {
// Switch off BT adapter if it was off before the screen and no BT device
// connected.
- if (adapter_ && adapter_->IsPresent() && adapter_->IsPowered() &&
+ if (adapter_.get() && adapter_->IsPresent() && adapter_->IsPowered() &&
!(pointing_device_connect_type_ == InputDeviceInfo::TYPE_BLUETOOTH ||
keyboard_device_connect_type_ == InputDeviceInfo::TYPE_BLUETOOTH) &&
adapter_initially_powered_ && !(*adapter_initially_powered_)) {
@@ -405,7 +405,7 @@ void HIDDetectionScreenHandler::UpdateDevices() {
}
void HIDDetectionScreenHandler::UpdateBTDevices() {
- if (!adapter_ || !adapter_->IsPresent() || !adapter_->IsPowered())
+ if (!adapter_.get() || !adapter_->IsPresent() || !adapter_->IsPowered())
return;
// If no connected devices found as pointing device and keyboard, we try to
@@ -446,7 +446,7 @@ void HIDDetectionScreenHandler::ProcessConnectedDevicesList(
void HIDDetectionScreenHandler::TryInitiateBTDevicesUpdate() {
if ((pointing_device_id_.empty() || keyboard_device_id_.empty()) &&
- adapter_) {
+ adapter_.get()) {
if (!adapter_->IsPresent()) {
// Switch on BT adapter later when it's available.
switch_on_adapter_when_ready_ = true;
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/l10n_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698