bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 176706.

Browse Source 
- See crbug.com/167209 for a description of why NSPrincipalClass needs to be specified in helper-Info.plist.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@987 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-01-15 19:12:28 +00:00
parent 5061db7c1b
commit d56fc817d5
15 changed files with 139 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libcef/browser/devtools_delegate.h
View File

@@ -6,11 +6,13 @@
#define CEF_LIBCEF_BROWSER_DEVTOOLS_DELEGATE_H_
#pragma once
#include <map>
#include <vector>
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.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"
@@ -18,6 +20,33 @@ namespace content {
class RenderViewHost;
}
class CefDevToolsBindingHandler
: public content::DevToolsHttpHandler::DevToolsAgentHostBinding {
public:
CefDevToolsBindingHandler();
// DevToolsAgentHostBinding overrides.
virtual std::string GetIdentifier(
content::DevToolsAgentHost* agent_host) OVERRIDE;
virtual content::DevToolsAgentHost* ForIdentifier(
const std::string& identifier) OVERRIDE;
std::string GetIdentifier(content::RenderViewHost* rvh);
private:
void GarbageCollect();
std::string random_seed_;
// Map of identifier to DevToolsAgentHost. Keeps the DevToolsAgentHost objects
// alive until the associated RVH is disconnected.
typedef std::map<std::string, scoped_refptr<content::DevToolsAgentHost> >
AgentsMap;
AgentsMap agents_map_;
DISALLOW_COPY_AND_ASSIGN(CefDevToolsBindingHandler);
};
class CefDevToolsDelegate : public content::DevToolsHttpHandlerDelegate {
public:
explicit CefDevToolsDelegate(int port);
@@ -38,7 +67,7 @@ class CefDevToolsDelegate : public content::DevToolsHttpHandlerDelegate {
private:
content::DevToolsHttpHandler* devtools_http_handler_;
scoped_ptr<content::DevToolsHttpHandler::RenderViewHostBinding> binding_;
scoped_ptr<CefDevToolsBindingHandler> binding_;
DISALLOW_COPY_AND_ASSIGN(CefDevToolsDelegate);
};