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

Side by Side Diff: content/shell/browser/blink_test_controller.cc

Issue 1353053002: Handle RESCAN events from the Bluetooth chooser by starting or extending a discovery session. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Rename StartDiscovery to StartDeviceDiscovery. Created 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/shell/browser/blink_test_controller.h" 5 #include "content/shell/browser/blink_test_controller.h"
6 6
7 #include <iostream> 7 #include <iostream>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 734 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 printer_->AddErrorMessage( 745 printer_->AddErrorMessage(
746 "FAIL: Must call setBluetoothManualChooser before " 746 "FAIL: Must call setBluetoothManualChooser before "
747 "sendBluetoothManualChooserEvent."); 747 "sendBluetoothManualChooserEvent.");
748 return; 748 return;
749 } 749 }
750 BluetoothChooser::Event event; 750 BluetoothChooser::Event event;
751 if (event_name == "cancelled") { 751 if (event_name == "cancelled") {
752 event = BluetoothChooser::Event::CANCELLED; 752 event = BluetoothChooser::Event::CANCELLED;
753 } else if (event_name == "selected") { 753 } else if (event_name == "selected") {
754 event = BluetoothChooser::Event::SELECTED; 754 event = BluetoothChooser::Event::SELECTED;
755 } else if (event_name == "rescan") {
756 event = BluetoothChooser::Event::RESCAN;
755 } else { 757 } else {
756 printer_->AddErrorMessage(base::StringPrintf( 758 printer_->AddErrorMessage(base::StringPrintf(
757 "FAIL: Unexpected sendBluetoothManualChooserEvent() event name '%s'.", 759 "FAIL: Unexpected sendBluetoothManualChooserEvent() event name '%s'.",
758 event_name.c_str())); 760 event_name.c_str()));
759 return; 761 return;
760 } 762 }
761 bluetooth_chooser_factory_->SendEvent(event, argument); 763 bluetooth_chooser_factory_->SendEvent(event, argument);
762 } 764 }
763 765
764 } // namespace content 766 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698