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

Unified Diff: chrome/browser/devtools/chrome_devtools_manager_delegate.cc

Issue 563923006: [DevTools] Split network handling off ChromeDevToolsManagerDelegate to be reused on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/devtools/chrome_devtools_manager_delegate.cc
diff --git a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
index a7cd2f63e806cf6e5061cac3a3c02540d5810c35..fd9cfedb62dea011092f0a282580f4852d2ea7b5 100644
--- a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
+++ b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
@@ -5,20 +5,12 @@
#include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
#include "base/values.h"
-#include "chrome/browser/devtools/devtools_network_conditions.h"
-#include "chrome/browser/devtools/devtools_network_controller.h"
-#include "chrome/browser/devtools/devtools_protocol.h"
-#include "chrome/browser/devtools/devtools_protocol_constants.h"
#include "chrome/browser/devtools/devtools_window.h"
#include "chrome/browser/profiles/profile.h"
-#include "content/public/browser/browser_thread.h"
#include "content/public/browser/devtools_agent_host.h"
-#include "content/public/browser/render_process_host.h"
-#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/site_instance.h"
-#include "content/public/browser/web_contents.h"
-ChromeDevToolsManagerDelegate::ChromeDevToolsManagerDelegate() {
+ChromeDevToolsManagerDelegate::ChromeDevToolsManagerDelegate()
+ : network_protocol_handler_(new DevToolsNetworkProtocolHandler()) {
}
ChromeDevToolsManagerDelegate::~ChromeDevToolsManagerDelegate() {
@@ -40,95 +32,11 @@ void ChromeDevToolsManagerDelegate::Inspect(
base::DictionaryValue* ChromeDevToolsManagerDelegate::HandleCommand(
content::DevToolsAgentHost* agent_host,
base::DictionaryValue* command_dict) {
- scoped_ptr<DevToolsProtocol::Command> command(
- DevToolsProtocol::ParseCommand(command_dict));
- if (!command)
- return NULL;
-
- namespace network = ::chrome::devtools::Network;
- const std::string method = command->method();
- scoped_ptr<DevToolsProtocol::Response> response;
-
- if (method == network::emulateNetworkConditions::kName) {
- response = EmulateNetworkConditions(agent_host, command.get());
- } else if (method == network::canEmulateNetworkConditions::kName) {
- response = CanEmulateNetworkConditions(agent_host, command.get());
- }
-
- if (response)
- return response->Serialize();
- return NULL;
-}
-
-Profile* ChromeDevToolsManagerDelegate::GetProfile(
- content::DevToolsAgentHost* agent_host) {
- content::WebContents* web_contents = agent_host->GetWebContents();
- if (!web_contents)
- return NULL;
- return Profile::FromBrowserContext(web_contents->GetBrowserContext());
-}
-
-scoped_ptr<DevToolsProtocol::Response>
-ChromeDevToolsManagerDelegate::CanEmulateNetworkConditions(
- content::DevToolsAgentHost* agent_host,
- DevToolsProtocol::Command* command) {
- base::DictionaryValue* result = new base::DictionaryValue();
- result->SetBoolean(chrome::devtools::kResult, true);
- return command->SuccessResponse(result);
-}
-
-scoped_ptr<DevToolsProtocol::Response>
-ChromeDevToolsManagerDelegate::EmulateNetworkConditions(
- content::DevToolsAgentHost* agent_host,
- DevToolsProtocol::Command* command) {
- base::DictionaryValue* params = command->params();
- namespace names = ::chrome::devtools::Network::emulateNetworkConditions;
-
- bool offline = false;
- if (!params || !params->GetBoolean(names::kParamOffline, &offline))
- return command->InvalidParamResponse(names::kParamOffline);
-
- double latency = 0.0;
- if (!params->GetDouble(names::kParamLatency, &latency))
- return command->InvalidParamResponse(names::kParamLatency);
- if (latency < 0.0)
- latency = 0.0;
-
- double download_throughput = 0.0;
- if (!params->GetDouble(names::kParamDownloadThroughput, &download_throughput))
- return command->InvalidParamResponse(names::kParamDownloadThroughput);
- if (download_throughput < 0.0)
- download_throughput = 0.0;
-
- double upload_throughput = 0.0;
- if (!params->GetDouble(names::kParamUploadThroughput, &upload_throughput))
- return command->InvalidParamResponse(names::kParamUploadThroughput);
- if (upload_throughput < 0.0)
- upload_throughput = 0.0;
-
- scoped_ptr<DevToolsNetworkConditions> conditions(
- new DevToolsNetworkConditions(
- offline, latency, download_throughput, upload_throughput));
-
- UpdateNetworkState(agent_host, conditions.Pass());
- return command->SuccessResponse(NULL);
-}
-
-void ChromeDevToolsManagerDelegate::UpdateNetworkState(
- content::DevToolsAgentHost* agent_host,
- scoped_ptr<DevToolsNetworkConditions> conditions) {
- Profile* profile = GetProfile(agent_host);
- if (!profile)
- return;
- profile->GetDevToolsNetworkController()->SetNetworkState(
- agent_host->GetId(), conditions.Pass());
+ return network_protocol_handler_->HandleCommand(agent_host, command_dict);
}
void ChromeDevToolsManagerDelegate::DevToolsAgentStateChanged(
content::DevToolsAgentHost* agent_host,
bool attached) {
- scoped_ptr<DevToolsNetworkConditions> conditions;
- if (attached)
- conditions.reset(new DevToolsNetworkConditions());
- UpdateNetworkState(agent_host, conditions.Pass());
+ network_protocol_handler_->DevToolsAgentStateChanged(agent_host, attached);
}

Powered by Google App Engine
This is Rietveld 408576698