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