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/browser_process.h" |
7 #include "chrome/browser/devtools/devtools_target_impl.h" | 8 #include "chrome/browser/devtools/devtools_target_impl.h" |
8 #include "chrome/browser/profiles/profile_manager.h" | 9 #include "chrome/browser/profiles/profile_manager.h" |
9 #include "chrome/browser/ui/browser_navigator.h" | 10 #include "chrome/browser/ui/browser_navigator.h" |
10 | 11 |
11 namespace { | 12 namespace { |
12 | 13 |
13 scoped_ptr<devtools_discovery::DevToolsTargetDescriptor> | 14 scoped_ptr<devtools_discovery::DevToolsTargetDescriptor> |
14 CreateNewChromeTab(const GURL& url) { | 15 CreateNewChromeTab(const GURL& url) { |
15 chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(), | 16 chrome::NavigateParams params( |
16 url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL); | 17 g_browser_process->profile_manager()->GetLastUsedProfile(), url, |
| 18 ui::PAGE_TRANSITION_AUTO_TOPLEVEL); |
17 params.disposition = NEW_FOREGROUND_TAB; | 19 params.disposition = NEW_FOREGROUND_TAB; |
18 chrome::Navigate(¶ms); | 20 chrome::Navigate(¶ms); |
19 if (!params.target_contents) | 21 if (!params.target_contents) |
20 return scoped_ptr<devtools_discovery::DevToolsTargetDescriptor>(); | 22 return scoped_ptr<devtools_discovery::DevToolsTargetDescriptor>(); |
21 return DevToolsTargetImpl::CreateForTab(params.target_contents).Pass(); | 23 return DevToolsTargetImpl::CreateForTab(params.target_contents).Pass(); |
22 } | 24 } |
23 | 25 |
24 } // namespace | 26 } // namespace |
25 | 27 |
26 ChromeDevToolsDiscoveryProvider::ChromeDevToolsDiscoveryProvider() { | 28 ChromeDevToolsDiscoveryProvider::ChromeDevToolsDiscoveryProvider() { |
(...skipping 13 matching lines...) Expand all Loading... |
40 } | 42 } |
41 | 43 |
42 // static | 44 // static |
43 void ChromeDevToolsDiscoveryProvider::Install() { | 45 void ChromeDevToolsDiscoveryProvider::Install() { |
44 devtools_discovery::DevToolsDiscoveryManager* discovery_manager = | 46 devtools_discovery::DevToolsDiscoveryManager* discovery_manager = |
45 devtools_discovery::DevToolsDiscoveryManager::GetInstance(); | 47 devtools_discovery::DevToolsDiscoveryManager::GetInstance(); |
46 discovery_manager->AddProvider( | 48 discovery_manager->AddProvider( |
47 make_scoped_ptr(new ChromeDevToolsDiscoveryProvider())); | 49 make_scoped_ptr(new ChromeDevToolsDiscoveryProvider())); |
48 discovery_manager->SetCreateCallback(base::Bind(&CreateNewChromeTab)); | 50 discovery_manager->SetCreateCallback(base::Bind(&CreateNewChromeTab)); |
49 } | 51 } |
OLD | NEW |