Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2189)

Unified Diff: content/shell/browser/shell_devtools_frontend.h

Issue 2756623002: DevTools: extract bindings from ShellDevToolsFrontend (Closed)
Patch Set: fixup Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/browser/shell_devtools_bindings.cc ('k') | content/shell/browser/shell_devtools_frontend.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell_devtools_frontend.h
diff --git a/content/shell/browser/shell_devtools_frontend.h b/content/shell/browser/shell_devtools_frontend.h
index 42f5c64074ff5778f415e0a98357c46e1ea5f2ed..4fbcc5b81143ff84843221d2136b79732ce931d5 100644
--- a/content/shell/browser/shell_devtools_frontend.h
+++ b/content/shell/browser/shell_devtools_frontend.h
@@ -9,82 +9,34 @@
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/weak_ptr.h"
-#include "base/values.h"
-#include "content/public/browser/devtools_agent_host.h"
#include "content/public/browser/web_contents_observer.h"
-#include "net/url_request/url_fetcher_delegate.h"
-
-#if !defined(OS_ANDROID)
-#include "content/public/browser/devtools_frontend_host.h"
-#endif
-
-namespace base {
-class Value;
-}
+#include "content/shell/browser/shell_devtools_bindings.h"
namespace content {
-class RenderViewHost;
class Shell;
class WebContents;
-class ShellDevToolsFrontend : public WebContentsObserver,
- public DevToolsAgentHostClient,
- public net::URLFetcherDelegate {
+class ShellDevToolsFrontend : public ShellDevToolsDelegate,
+ public WebContentsObserver {
public:
static ShellDevToolsFrontend* Show(WebContents* inspected_contents);
void Activate();
void Focus();
void InspectElementAt(int x, int y);
- void Close();
-
- void DisconnectFromTarget();
+ void Close() override;
Shell* frontend_shell() const { return frontend_shell_; }
- void CallClientFunction(const std::string& function_name,
- const base::Value* arg1,
- const base::Value* arg2,
- const base::Value* arg3);
-
- protected:
- ShellDevToolsFrontend(Shell* frontend_shell, WebContents* inspected_contents);
- ~ShellDevToolsFrontend() override;
-
- // content::DevToolsAgentHostClient implementation.
- void AgentHostClosed(DevToolsAgentHost* agent_host, bool replaced) override;
- void DispatchProtocolMessage(DevToolsAgentHost* agent_host,
- const std::string& message) override;
- void SetPreferences(const std::string& json);
- virtual void HandleMessageFromDevToolsFrontend(const std::string& message);
-
private:
// WebContentsObserver overrides
- void RenderViewCreated(RenderViewHost* render_view_host) override;
- void DocumentAvailableInMainFrame() override;
void WebContentsDestroyed() override;
- // net::URLFetcherDelegate overrides.
- void OnURLFetchComplete(const net::URLFetcher* source) override;
-
- void SendMessageAck(int request_id,
- const base::Value* arg1);
-
+ ShellDevToolsFrontend(Shell* frontend_shell, WebContents* inspected_contents);
+ ~ShellDevToolsFrontend() override;
Shell* frontend_shell_;
- WebContents* inspected_contents_;
- scoped_refptr<DevToolsAgentHost> agent_host_;
- int inspect_element_at_x_;
- int inspect_element_at_y_;
-#if !defined(OS_ANDROID)
- std::unique_ptr<DevToolsFrontendHost> frontend_host_;
-#endif
- using PendingRequestsMap = std::map<const net::URLFetcher*, int>;
- PendingRequestsMap pending_requests_;
- base::DictionaryValue preferences_;
- base::WeakPtrFactory<ShellDevToolsFrontend> weak_factory_;
+ std::unique_ptr<ShellDevToolsBindings> devtools_bindings_;
DISALLOW_COPY_AND_ASSIGN(ShellDevToolsFrontend);
};
« no previous file with comments | « content/shell/browser/shell_devtools_bindings.cc ('k') | content/shell/browser/shell_devtools_frontend.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698