| OLD | NEW |
| 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 "chrome/browser/devtools/chrome_devtools_discovery_provider.h" | 5 #include "chrome/browser/devtools/chrome_devtools_discovery_provider.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "chrome/browser/devtools/devtools_target_impl.h" | |
| 9 #include "chrome/browser/profiles/profile_manager.h" | 8 #include "chrome/browser/profiles/profile_manager.h" |
| 10 #include "chrome/browser/ui/browser_navigator.h" | 9 #include "chrome/browser/ui/browser_navigator.h" |
| 11 #include "chrome/browser/ui/browser_navigator_params.h" | 10 #include "chrome/browser/ui/browser_navigator_params.h" |
| 12 #include "content/public/browser/devtools_agent_host.h" | 11 #include "content/public/browser/devtools_agent_host.h" |
| 13 | 12 |
| 14 namespace { | 13 namespace { |
| 15 | 14 |
| 16 std::unique_ptr<devtools_discovery::DevToolsTargetDescriptor> | 15 scoped_refptr<content::DevToolsAgentHost> |
| 17 CreateNewChromeTab(const GURL& url) { | 16 CreateNewChromeTab(const GURL& url) { |
| 18 chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(), | 17 chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(), |
| 19 url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL); | 18 url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL); |
| 20 params.disposition = NEW_FOREGROUND_TAB; | 19 params.disposition = NEW_FOREGROUND_TAB; |
| 21 chrome::Navigate(¶ms); | 20 chrome::Navigate(¶ms); |
| 22 if (!params.target_contents) | 21 if (!params.target_contents) |
| 23 return std::unique_ptr<devtools_discovery::DevToolsTargetDescriptor>(); | 22 return nullptr; |
| 24 | 23 |
| 25 if (!params.target_contents) | 24 if (!params.target_contents) |
| 26 return nullptr; | 25 return nullptr; |
| 27 scoped_refptr<content::DevToolsAgentHost> host = | 26 return content::DevToolsAgentHost::GetOrCreateFor(params.target_contents); |
| 28 content::DevToolsAgentHost::GetOrCreateFor(params.target_contents); | |
| 29 return std::unique_ptr<DevToolsTargetImpl>(new DevToolsTargetImpl(host)); | |
| 30 } | 27 } |
| 31 | 28 |
| 32 } // namespace | 29 } // namespace |
| 33 | 30 |
| 34 ChromeDevToolsDiscoveryProvider::ChromeDevToolsDiscoveryProvider() { | 31 ChromeDevToolsDiscoveryProvider::ChromeDevToolsDiscoveryProvider() { |
| 35 } | 32 } |
| 36 | 33 |
| 37 ChromeDevToolsDiscoveryProvider::~ChromeDevToolsDiscoveryProvider() { | 34 ChromeDevToolsDiscoveryProvider::~ChromeDevToolsDiscoveryProvider() { |
| 38 } | 35 } |
| 39 | 36 |
| 40 devtools_discovery::DevToolsTargetDescriptor::List | 37 content::DevToolsAgentHost::List |
| 41 ChromeDevToolsDiscoveryProvider::GetDescriptors() { | 38 ChromeDevToolsDiscoveryProvider::GetDescriptors() { |
| 42 std::vector<DevToolsTargetImpl*> list = DevToolsTargetImpl::EnumerateAll(); | 39 return content::DevToolsAgentHost::GetOrCreateAll(); |
| 43 devtools_discovery::DevToolsTargetDescriptor::List result; | |
| 44 result.reserve(list.size()); | |
| 45 for (auto* descriptor : list) | |
| 46 result.push_back(descriptor); | |
| 47 return result; | |
| 48 } | 40 } |
| 49 | 41 |
| 50 // static | 42 // static |
| 51 void ChromeDevToolsDiscoveryProvider::Install() { | 43 void ChromeDevToolsDiscoveryProvider::Install() { |
| 52 devtools_discovery::DevToolsDiscoveryManager* discovery_manager = | 44 devtools_discovery::DevToolsDiscoveryManager* discovery_manager = |
| 53 devtools_discovery::DevToolsDiscoveryManager::GetInstance(); | 45 devtools_discovery::DevToolsDiscoveryManager::GetInstance(); |
| 54 discovery_manager->AddProvider( | 46 discovery_manager->AddProvider( |
| 55 base::WrapUnique(new ChromeDevToolsDiscoveryProvider())); | 47 base::WrapUnique(new ChromeDevToolsDiscoveryProvider())); |
| 56 discovery_manager->SetCreateCallback(base::Bind(&CreateNewChromeTab)); | 48 discovery_manager->SetCreateCallback(base::Bind(&CreateNewChromeTab)); |
| 57 } | 49 } |
| OLD | NEW |