OLD | NEW |
---|---|
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 "content/browser/devtools/devtools_power_handler.h" | 5 #include "content/browser/devtools/devtools_power_handler.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/values.h" | 8 #include "base/values.h" |
9 #include "content/browser/devtools/devtools_protocol_constants.h" | 9 #include "content/browser/devtools/devtools_protocol_constants.h" |
10 #include "content/browser/power_profiler/power_profiler_service.h" | 10 #include "content/browser/power_profiler/power_profiler_service.h" |
11 | 11 |
12 namespace content { | 12 namespace content { |
13 | 13 |
14 DevToolsPowerHandler::DevToolsPowerHandler() { | 14 DevToolsPowerHandler::DevToolsPowerHandler() { |
15 RegisterCommandHandler(devtools::Power::start::kName, | 15 RegisterCommandHandler(devtools::Power::start::kName, |
16 base::Bind(&DevToolsPowerHandler::OnStart, | 16 base::Bind(&DevToolsPowerHandler::OnStart, |
17 base::Unretained(this))); | 17 base::Unretained(this))); |
18 RegisterCommandHandler(devtools::Power::end::kName, | 18 RegisterCommandHandler(devtools::Power::end::kName, |
19 base::Bind(&DevToolsPowerHandler::OnEnd, | 19 base::Bind(&DevToolsPowerHandler::OnEnd, |
20 base::Unretained(this))); | 20 base::Unretained(this))); |
21 RegisterCommandHandler(devtools::Power::canProfilePower::kName, | 21 RegisterCommandHandler(devtools::Power::canProfilePower::kName, |
22 base::Bind(&DevToolsPowerHandler::OnCanProfilePower, | 22 base::Bind(&DevToolsPowerHandler::OnCanProfilePower, |
23 base::Unretained(this))); | 23 base::Unretained(this))); |
24 } | 24 } |
25 | 25 |
26 DevToolsPowerHandler::~DevToolsPowerHandler() { | 26 DevToolsPowerHandler::~DevToolsPowerHandler() { |
27 if (PowerProfilerService::GetInstance()->HasObserver(this)) { | |
qsr
2014/06/17 16:52:48
That feels wrong to me. If I have added myself to
| |
28 PowerProfilerService::GetInstance()->RemoveObserver(this); | |
29 } | |
27 } | 30 } |
28 | 31 |
29 void DevToolsPowerHandler::OnPowerEvent(const PowerEventVector& events) { | 32 void DevToolsPowerHandler::OnPowerEvent(const PowerEventVector& events) { |
30 base::DictionaryValue* params = new base::DictionaryValue(); | 33 base::DictionaryValue* params = new base::DictionaryValue(); |
31 base::ListValue* event_list = new base::ListValue(); | 34 base::ListValue* event_list = new base::ListValue(); |
32 | 35 |
33 std::vector<PowerEvent>::const_iterator iter; | 36 std::vector<PowerEvent>::const_iterator iter; |
34 for (iter = events.begin(); iter != events.end(); ++iter) { | 37 for (iter = events.begin(); iter != events.end(); ++iter) { |
35 base::DictionaryValue* event_body = new base::DictionaryValue(); | 38 base::DictionaryValue* event_body = new base::DictionaryValue(); |
36 | 39 |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
73 DevToolsPowerHandler::OnCanProfilePower( | 76 DevToolsPowerHandler::OnCanProfilePower( |
74 scoped_refptr<DevToolsProtocol::Command> command) { | 77 scoped_refptr<DevToolsProtocol::Command> command) { |
75 base::DictionaryValue* result = new base::DictionaryValue(); | 78 base::DictionaryValue* result = new base::DictionaryValue(); |
76 result->SetBoolean(devtools::kResult, | 79 result->SetBoolean(devtools::kResult, |
77 PowerProfilerService::GetInstance()->IsAvailable()); | 80 PowerProfilerService::GetInstance()->IsAvailable()); |
78 | 81 |
79 return command->SuccessResponse(result); | 82 return command->SuccessResponse(result); |
80 } | 83 } |
81 | 84 |
82 } // namespace content | 85 } // namespace content |
OLD | NEW |