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

Unified Diff: chrome/browser/ui/android/usb_chooser_dialog_android.cc

Issue 2062333002: mojo::Callback -> base::Callback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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/android/usb_chooser_dialog_android.cc
diff --git a/chrome/browser/ui/android/usb_chooser_dialog_android.cc b/chrome/browser/ui/android/usb_chooser_dialog_android.cc
index 4bc2aa36a8b2c7dd28bf72de230598000d466ce0..6026fed341672954c0bd680959514597cc65f021 100644
--- a/chrome/browser/ui/android/usb_chooser_dialog_android.cc
+++ b/chrome/browser/ui/android/usb_chooser_dialog_android.cc
@@ -136,7 +136,7 @@ void UsbChooserDialogAndroid::Select(const std::string& guid) {
device->RequestPermission(
base::Bind(&OnDevicePermissionRequestComplete, device, callback_));
- callback_.reset(); // Reset |callback_| so that it is only run once.
+ callback_.Reset(); // Reset |callback_| so that it is only run once.
Java_UsbChooserDialog_closeDialog(base::android::AttachCurrentThread(),
java_dialog_.obj());
@@ -150,8 +150,9 @@ void UsbChooserDialogAndroid::Select(const std::string& guid) {
}
void UsbChooserDialogAndroid::Cancel() {
+ DCHECK(!callback_.is_null());
callback_.Run(nullptr);
- callback_.reset(); // Reset |callback_| so that it is only run once.
+ callback_.Reset(); // Reset |callback_| so that it is only run once.
Java_UsbChooserDialog_closeDialog(base::android::AttachCurrentThread(),
java_dialog_.obj());
« no previous file with comments | « chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc ('k') | chrome/browser/usb/usb_chooser_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698