OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_manager_delegate.h" | 5 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h" |
6 | 6 |
7 #include "base/values.h" | 7 #include "base/values.h" |
8 #include "chrome/browser/devtools/devtools_target_impl.h" | 8 #include "chrome/browser/devtools/devtools_target_impl.h" |
9 #include "chrome/browser/devtools/devtools_window.h" | 9 #include "chrome/browser/devtools/devtools_window.h" |
10 #include "chrome/browser/history/top_sites.h" | 10 #include "chrome/browser/history/top_sites.h" |
| 11 #include "chrome/browser/history/top_sites_factory.h" |
11 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
12 #include "chrome/browser/profiles/profile_manager.h" | 13 #include "chrome/browser/profiles/profile_manager.h" |
13 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
14 #include "chrome/browser/ui/browser_iterator.h" | 15 #include "chrome/browser/ui/browser_iterator.h" |
15 #include "content/public/browser/browser_thread.h" | 16 #include "content/public/browser/browser_thread.h" |
16 #include "content/public/browser/devtools_agent_host.h" | 17 #include "content/public/browser/devtools_agent_host.h" |
17 #include "content/public/browser/web_contents.h" | 18 #include "content/public/browser/web_contents.h" |
18 | 19 |
19 ChromeDevToolsManagerDelegate::ChromeDevToolsManagerDelegate() | 20 ChromeDevToolsManagerDelegate::ChromeDevToolsManagerDelegate() |
20 : network_protocol_handler_(new DevToolsNetworkProtocolHandler()) { | 21 : network_protocol_handler_(new DevToolsNetworkProtocolHandler()) { |
(...skipping 22 matching lines...) Expand all Loading... |
43 void ChromeDevToolsManagerDelegate::DevToolsAgentStateChanged( | 44 void ChromeDevToolsManagerDelegate::DevToolsAgentStateChanged( |
44 content::DevToolsAgentHost* agent_host, | 45 content::DevToolsAgentHost* agent_host, |
45 bool attached) { | 46 bool attached) { |
46 network_protocol_handler_->DevToolsAgentStateChanged(agent_host, attached); | 47 network_protocol_handler_->DevToolsAgentStateChanged(agent_host, attached); |
47 } | 48 } |
48 | 49 |
49 std::string ChromeDevToolsManagerDelegate::GetPageThumbnailData( | 50 std::string ChromeDevToolsManagerDelegate::GetPageThumbnailData( |
50 const GURL& url) { | 51 const GURL& url) { |
51 for (chrome::BrowserIterator it; !it.done(); it.Next()) { | 52 for (chrome::BrowserIterator it; !it.done(); it.Next()) { |
52 Profile* profile = (*it)->profile(); | 53 Profile* profile = (*it)->profile(); |
53 history::TopSites* top_sites = profile->GetTopSites(); | 54 scoped_refptr<history::TopSites> top_sites = |
| 55 TopSitesFactory::GetForProfile(profile); |
54 if (!top_sites) | 56 if (!top_sites) |
55 continue; | 57 continue; |
56 scoped_refptr<base::RefCountedMemory> data; | 58 scoped_refptr<base::RefCountedMemory> data; |
57 if (top_sites->GetPageThumbnail(url, false, &data)) | 59 if (top_sites->GetPageThumbnail(url, false, &data)) |
58 return std::string(data->front_as<char>(), data->size()); | 60 return std::string(data->front_as<char>(), data->size()); |
59 } | 61 } |
60 return std::string(); | 62 return std::string(); |
61 } | 63 } |
62 | 64 |
63 scoped_ptr<content::DevToolsTarget> | 65 scoped_ptr<content::DevToolsTarget> |
64 ChromeDevToolsManagerDelegate::CreateNewTarget(const GURL& url) { | 66 ChromeDevToolsManagerDelegate::CreateNewTarget(const GURL& url) { |
65 chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(), | 67 chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(), |
66 url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL); | 68 url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL); |
67 params.disposition = NEW_FOREGROUND_TAB; | 69 params.disposition = NEW_FOREGROUND_TAB; |
68 chrome::Navigate(¶ms); | 70 chrome::Navigate(¶ms); |
69 if (!params.target_contents) | 71 if (!params.target_contents) |
70 return scoped_ptr<content::DevToolsTarget>(); | 72 return scoped_ptr<content::DevToolsTarget>(); |
71 return scoped_ptr<content::DevToolsTarget>( | 73 return scoped_ptr<content::DevToolsTarget>( |
72 DevToolsTargetImpl::CreateForWebContents(params.target_contents, true)); | 74 DevToolsTargetImpl::CreateForWebContents(params.target_contents, true)); |
73 } | 75 } |
74 | 76 |
75 void ChromeDevToolsManagerDelegate::EnumerateTargets(TargetCallback callback) { | 77 void ChromeDevToolsManagerDelegate::EnumerateTargets(TargetCallback callback) { |
76 DevToolsTargetImpl::EnumerateAllTargets( | 78 DevToolsTargetImpl::EnumerateAllTargets( |
77 *reinterpret_cast<DevToolsTargetImpl::Callback*>(&callback)); | 79 *reinterpret_cast<DevToolsTargetImpl::Callback*>(&callback)); |
78 } | 80 } |
79 | 81 |
OLD | NEW |