Update to Chromium revision c03558c9 (#326273)

This commit is contained in:
Marshall Greenblatt
2015-04-23 13:03:42 +03:00
parent aeb35d2f36
commit faafdd2cd7
28 changed files with 154 additions and 103 deletions

View File

@@ -12,16 +12,17 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "components/devtools_http_handler/devtools_http_handler.h"
#include "components/devtools_http_handler/devtools_http_handler_delegate.h"
#include "content/public/browser/devtools_agent_host.h"
#include "content/public/browser/devtools_http_handler.h"
#include "content/public/browser/devtools_http_handler_delegate.h"
#include "content/public/browser/devtools_manager_delegate.h"
namespace content {
class RenderViewHost;
}
class CefDevToolsDelegate : public content::DevToolsHttpHandlerDelegate {
class CefDevToolsDelegate :
public devtools_http_handler::DevToolsHttpHandlerDelegate {
public:
explicit CefDevToolsDelegate(uint16 port);
~CefDevToolsDelegate() override;
@@ -31,14 +32,13 @@ class CefDevToolsDelegate : public content::DevToolsHttpHandlerDelegate {
// DevToolsHttpHandlerDelegate overrides.
std::string GetDiscoveryPageHTML() override;
bool BundlesFrontendResources() override;
base::FilePath GetDebugFrontendDir() override;
std::string GetFrontendResource(const std::string& path) override;
// Returns the chrome-devtools URL.
std::string GetChromeDevToolsURL();
private:
scoped_ptr<content::DevToolsHttpHandler> devtools_http_handler_;
scoped_ptr<devtools_http_handler::DevToolsHttpHandler> devtools_http_handler_;
DISALLOW_COPY_AND_ASSIGN(CefDevToolsDelegate);
};