Update to Chromium revision 160122.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@843 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-10-04 19:17:13 +00:00
parent 13afc1226f
commit 163cc7d9cc
14 changed files with 159 additions and 33 deletions

View File

@@ -14,17 +14,13 @@
#include "content/public/browser/devtools_http_handler.h"
#include "content/public/browser/devtools_http_handler_delegate.h"
namespace net {
class URLRequestContextGetter;
}
namespace content {
class RenderViewHost;
}
class CefDevToolsDelegate : public content::DevToolsHttpHandlerDelegate {
public:
CefDevToolsDelegate(int port, net::URLRequestContextGetter* context_getter);
explicit CefDevToolsDelegate(int port);
virtual ~CefDevToolsDelegate();
// Stops http server.
@@ -33,7 +29,8 @@ class CefDevToolsDelegate : public content::DevToolsHttpHandlerDelegate {
// DevToolsHttpProtocolHandler::Delegate overrides.
virtual std::string GetDiscoveryPageHTML() OVERRIDE;
virtual bool BundlesFrontendResources() OVERRIDE;
virtual std::string GetFrontendResourcesBaseURL() OVERRIDE;
virtual FilePath GetDebugFrontendDir() OVERRIDE;
virtual std::string GetPageThumbnailData(const GURL& url) OVERRIDE;
// Returns the DevTools URL for the specified RenderViewHost.
std::string GetDevToolsURL(content::RenderViewHost* rvh, bool http_scheme);