Commit 67bd6cdd authored by Leonard Grey's avatar Leonard Grey Committed by Chromium LUCI CQ

[Code health] Convert DevToolsTargetsUIHandler callback to repeating

Bug: 1152274
Change-Id: Idc567b91983adc94a968789c5599c1bfccfdb74b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2583011
Commit-Queue: Andrey Kosyakov <caseq@chromium.org>
Reviewed-by: default avatarAndrey Kosyakov <caseq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835696}
parent 535cac79
...@@ -305,12 +305,9 @@ void AdbTargetsUIHandler::DeviceListChanged( ...@@ -305,12 +305,9 @@ void AdbTargetsUIHandler::DeviceListChanged(
// DevToolsTargetsUIHandler --------------------------------------------------- // DevToolsTargetsUIHandler ---------------------------------------------------
DevToolsTargetsUIHandler::DevToolsTargetsUIHandler( DevToolsTargetsUIHandler::DevToolsTargetsUIHandler(const std::string& source_id,
const std::string& source_id, Callback callback)
const Callback& callback) : source_id_(source_id), callback_(std::move(callback)) {}
: source_id_(source_id),
callback_(callback) {
}
DevToolsTargetsUIHandler::~DevToolsTargetsUIHandler() { DevToolsTargetsUIHandler::~DevToolsTargetsUIHandler() {
} }
...@@ -318,7 +315,7 @@ DevToolsTargetsUIHandler::~DevToolsTargetsUIHandler() { ...@@ -318,7 +315,7 @@ DevToolsTargetsUIHandler::~DevToolsTargetsUIHandler() {
// static // static
std::unique_ptr<DevToolsTargetsUIHandler> std::unique_ptr<DevToolsTargetsUIHandler>
DevToolsTargetsUIHandler::CreateForLocal( DevToolsTargetsUIHandler::CreateForLocal(
const DevToolsTargetsUIHandler::Callback& callback, DevToolsTargetsUIHandler::Callback callback,
Profile* profile) { Profile* profile) {
return std::unique_ptr<DevToolsTargetsUIHandler>( return std::unique_ptr<DevToolsTargetsUIHandler>(
new LocalTargetsUIHandler(callback, profile)); new LocalTargetsUIHandler(callback, profile));
...@@ -327,7 +324,7 @@ DevToolsTargetsUIHandler::CreateForLocal( ...@@ -327,7 +324,7 @@ DevToolsTargetsUIHandler::CreateForLocal(
// static // static
std::unique_ptr<DevToolsTargetsUIHandler> std::unique_ptr<DevToolsTargetsUIHandler>
DevToolsTargetsUIHandler::CreateForAdb( DevToolsTargetsUIHandler::CreateForAdb(
const DevToolsTargetsUIHandler::Callback& callback, DevToolsTargetsUIHandler::Callback callback,
Profile* profile) { Profile* profile) {
return std::unique_ptr<DevToolsTargetsUIHandler>( return std::unique_ptr<DevToolsTargetsUIHandler>(
new AdbTargetsUIHandler(callback, profile)); new AdbTargetsUIHandler(callback, profile));
......
...@@ -22,21 +22,21 @@ class Profile; ...@@ -22,21 +22,21 @@ class Profile;
class DevToolsTargetsUIHandler { class DevToolsTargetsUIHandler {
public: public:
typedef base::Callback<void(const std::string&, typedef base::RepeatingCallback<void(const std::string&,
const base::ListValue&)> Callback; const base::ListValue&)>
Callback;
DevToolsTargetsUIHandler(const std::string& source_id, DevToolsTargetsUIHandler(const std::string& source_id, Callback callback);
const Callback& callback);
virtual ~DevToolsTargetsUIHandler(); virtual ~DevToolsTargetsUIHandler();
std::string source_id() const { return source_id_; } std::string source_id() const { return source_id_; }
static std::unique_ptr<DevToolsTargetsUIHandler> CreateForLocal( static std::unique_ptr<DevToolsTargetsUIHandler> CreateForLocal(
const Callback& callback, Callback callback,
Profile* profile); Profile* profile);
static std::unique_ptr<DevToolsTargetsUIHandler> CreateForAdb( static std::unique_ptr<DevToolsTargetsUIHandler> CreateForAdb(
const Callback& callback, Callback callback,
Profile* profile); Profile* profile);
scoped_refptr<content::DevToolsAgentHost> GetTarget( scoped_refptr<content::DevToolsAgentHost> GetTarget(
......
...@@ -512,7 +512,7 @@ void InspectUI::StartListeningNotifications() { ...@@ -512,7 +512,7 @@ void InspectUI::StartListeningNotifications() {
Profile* profile = Profile::FromWebUI(web_ui()); Profile* profile = Profile::FromWebUI(web_ui());
DevToolsTargetsUIHandler::Callback callback = DevToolsTargetsUIHandler::Callback callback =
base::Bind(&InspectUI::PopulateTargets, base::Unretained(this)); base::BindRepeating(&InspectUI::PopulateTargets, base::Unretained(this));
PopulateAdditionalTargets(GetUiDevToolsTargets()); PopulateAdditionalTargets(GetUiDevToolsTargets());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment