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

Unified Diff: chrome/browser/devtools/devtools_ui_bindings.h

Issue 967513002: DevTools: do not use debug target when loading URLs for the front-end (chrome side). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@t5
Patch Set: = 0 for pure virtual Created 5 years, 10 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
Index: chrome/browser/devtools/devtools_ui_bindings.h
diff --git a/chrome/browser/devtools/devtools_ui_bindings.h b/chrome/browser/devtools/devtools_ui_bindings.h
index 6bb00915f2de2cd8db7eed92aebd4695f8eae049..58aabceddc76d0343faf65e27235d98dafa9f5b2 100644
--- a/chrome/browser/devtools/devtools_ui_bindings.h
+++ b/chrome/browser/devtools/devtools_ui_bindings.h
@@ -21,6 +21,7 @@
#include "content/public/browser/devtools_frontend_host.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
+#include "net/url_request/url_fetcher_delegate.h"
#include "ui/gfx/geometry/size.h"
class InfoBarService;
@@ -36,7 +37,8 @@ class DevToolsUIBindings : public content::NotificationObserver,
public content::DevToolsFrontendHost::Delegate,
public DevToolsEmbedderMessageDispatcher::Delegate,
public DevToolsAndroidBridge::DeviceCountListener,
- public content::DevToolsAgentHostClient {
+ public content::DevToolsAgentHostClient,
+ public net::URLFetcherDelegate {
public:
static DevToolsUIBindings* ForWebContents(
content::WebContents* web_contents);
@@ -102,6 +104,10 @@ class DevToolsUIBindings : public content::NotificationObserver,
const gfx::Rect& rect) override;
void InspectElementCompleted(int request_id) override;
void InspectedURLChanged(int request_id, const std::string& url) override;
+ void LoadNetworkResource(int request_id,
+ const std::string& url,
+ const std::string& headers,
+ int stream_id) override;
void SetIsDocked(int request_id, bool is_docked) override;
void OpenInNewTab(int request_id, const std::string& url) override;
void SaveToFile(int request_id,
@@ -142,9 +148,13 @@ class DevToolsUIBindings : public content::NotificationObserver,
const std::string& name,
int action) override;
+ // net::URLFetcherDelegate overrides.
+ void OnURLFetchComplete(const net::URLFetcher* source) override;
+
void EnableRemoteDeviceCounter(bool enable);
- void SendMessageAck(int request_id);
+ void SendMessageAck(int request_id,
+ const base::Value* arg1);
// DevToolsAndroidBridge::DeviceCountListener override:
void DeviceCountChanged(int count) override;
@@ -206,6 +216,8 @@ class DevToolsUIBindings : public content::NotificationObserver,
scoped_ptr<DevToolsTargetsUIHandler> remote_targets_handler_;
scoped_ptr<DevToolsEmbedderMessageDispatcher> embedder_message_dispatcher_;
GURL url_;
+ using PendingRequestsMap = std::map<const net::URLFetcher*, int>;
+ PendingRequestsMap pending_requests_;
base::WeakPtrFactory<DevToolsUIBindings> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(DevToolsUIBindings);
« no previous file with comments | « chrome/browser/devtools/devtools_embedder_message_dispatcher.cc ('k') | chrome/browser/devtools/devtools_ui_bindings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698