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

Side by Side Diff: components/devtools_discovery/devtools_discovery_manager.cc

Issue 2234343002: Fixes naming issues in Browser protocol handler + adds tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/devtools_discovery/devtools_discovery_manager.h" 5 #include "components/devtools_discovery/devtools_discovery_manager.h"
6 6
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 #include "components/devtools_discovery/basic_target_descriptor.h" 8 #include "components/devtools_discovery/basic_target_descriptor.h"
9 #include "content/public/browser/devtools_agent_host.h" 9 #include "content/public/browser/devtools_agent_host.h"
10 10
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 DevToolsDiscoveryManager::GetDescriptorsFromProviders() { 56 DevToolsDiscoveryManager::GetDescriptorsFromProviders() {
57 DevToolsTargetDescriptor::List result; 57 DevToolsTargetDescriptor::List result;
58 for (auto* provider : providers_) { 58 for (auto* provider : providers_) {
59 DevToolsTargetDescriptor::List partial = provider->GetDescriptors(); 59 DevToolsTargetDescriptor::List partial = provider->GetDescriptors();
60 result.insert(result.begin(), partial.begin(), partial.end()); 60 result.insert(result.begin(), partial.begin(), partial.end());
61 } 61 }
62 return result; 62 return result;
63 } 63 }
64 64
65 std::unique_ptr<base::DictionaryValue> 65 std::unique_ptr<base::DictionaryValue>
66 DevToolsDiscoveryManager::HandleNewTargetCommand( 66 DevToolsDiscoveryManager::HandleCreateTargetCommand(
67 base::DictionaryValue* command_dict) { 67 base::DictionaryValue* command_dict) {
68 int id; 68 int id;
69 std::string method; 69 std::string method;
70 std::string url; 70 std::string url;
71 const base::DictionaryValue* params_dict = nullptr; 71 const base::DictionaryValue* params_dict = nullptr;
72 if (command_dict->GetInteger("id", &id) && 72 if (command_dict->GetInteger("id", &id) &&
73 command_dict->GetString("method", &method) && 73 command_dict->GetString("method", &method) &&
74 method == "Browser.createTarget" && 74 method == "Browser.createTarget" &&
75 command_dict->GetDictionary("params", &params_dict) && 75 command_dict->GetDictionary("params", &params_dict) &&
76 params_dict->GetString("url", &url)) { 76 params_dict->GetString("url", &url)) {
77 std::unique_ptr<devtools_discovery::DevToolsTargetDescriptor> descriptor = 77 std::unique_ptr<devtools_discovery::DevToolsTargetDescriptor> descriptor =
78 CreateNew(GURL(url)); 78 CreateNew(GURL(url));
79 if (!descriptor) 79 if (!descriptor)
80 return nullptr; 80 return nullptr;
81 std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue()); 81 std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
82 result->SetInteger("id", id); 82 result->SetInteger("id", id);
83 std::unique_ptr<base::DictionaryValue> cmd_result( 83 std::unique_ptr<base::DictionaryValue> cmd_result(
84 new base::DictionaryValue()); 84 new base::DictionaryValue());
85 cmd_result->SetString("pageId", descriptor->GetId()); 85 cmd_result->SetString("targetId", descriptor->GetId());
86 result->Set("result", std::move(cmd_result)); 86 result->Set("result", std::move(cmd_result));
87 return result; 87 return result;
88 } 88 }
89 return nullptr; 89 return nullptr;
90 } 90 }
91 91
92 } // namespace devtools_discovery 92 } // namespace devtools_discovery
OLDNEW
« no previous file with comments | « components/devtools_discovery/devtools_discovery_manager.h ('k') | content/browser/devtools/protocol/browser_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698