Merge lp:~abreu-alexandre/oxide/add-devtools-support into lp:~oxide-developers/oxide/oxide.trunk

[Alexandre Abreu]

Add devtools support

Add devtools support

[lp:~abreu-alexandre/oxide/add-devtools-support]

614. By Alexandre Abreu on 2014-06-16

remove leftover clutter

[Chris Coulson (chrisccoulson)]

Left my comments inline :)

review: Needs Fixing

[lp:~abreu-alexandre/oxide/add-devtools-support]

615. By Alexandre Abreu on 2014-06-23

fixes

[Alexandre Abreu (abreu-alexandre)]

Thank you for the review,
I updated the MR,

[Chris Coulson (chrisccoulson)]

Thanks! Almost there, I've just added a few minor comments

review: Needs Fixing

[lp:~abreu-alexandre/oxide/add-devtools-support]

616. By Alexandre Abreu on 2014-06-24

fixes

[Alexandre Abreu (abreu-alexandre)]

I updated the MR,

[Chris Coulson (chrisccoulson)]

Thanks, this is good to merge now :)

review: Approve

=== modified file 'qt/core/api/oxideqwebpreferences.h'
--- qt/core/api/oxideqwebpreferences.h	2014-05-26 22:12:33 +0000
+++ qt/core/api/oxideqwebpreferences.h	2014-06-24 11:52:03 +0000
@@ -139,6 +139,7 @@
   void setTouchEnabled(bool enabled);
 
  Q_SIGNALS:
+
   void standardFontFamilyChanged();
   void fixedFontFamilyChanged();
   void serifFontFamilyChanged();

=== modified file 'qt/core/glue/oxide_qt_web_context_adapter.cc'
--- qt/core/glue/oxide_qt_web_context_adapter.cc	2014-06-02 21:56:59 +0000
+++ qt/core/glue/oxide_qt_web_context_adapter.cc	2014-06-24 11:52:03 +0000
@@ -81,6 +81,37 @@
   }
 }
 
+bool WebContextAdapter::devtoolsEnabled() const {
+  if (isInitialized()) {
+    return priv->context_->GetDevtoolsEnabled();
+  }
+  return priv->construct_props_->devtools_enabled;
+}
+
+void WebContextAdapter::setDevtoolsEnabled(bool enabled) {
+  if (isInitialized()) {
+    qWarning() << "Cannot change the devtools enabled after inititialization";
+    return;
+  }
+  priv->construct_props_->devtools_enabled = enabled;
+}
+
+int WebContextAdapter::devtoolsPort() const {
+  if (isInitialized()) {
+    return priv->context_->GetDevtoolsPort();
+  }
+
+  return priv->construct_props_->devtools_port;
+}
+
+void WebContextAdapter::setDevtoolsPort(int port) {
+  if (isInitialized()) {
+    qWarning() << "Cannot change the devtools port after inititialization";
+    return;
+  }
+  priv->construct_props_->devtools_port = port;
+}
+
 QUrl WebContextAdapter::dataPath() const {
   base::FilePath path;
   if (isInitialized()) {

=== modified file 'qt/core/glue/oxide_qt_web_context_adapter.h'
--- qt/core/glue/oxide_qt_web_context_adapter.h	2014-04-02 19:57:47 +0000
+++ qt/core/glue/oxide_qt_web_context_adapter.h	2014-06-24 11:52:03 +0000
@@ -105,6 +105,12 @@
   bool popupBlockerEnabled() const;
   void setPopupBlockerEnabled(bool enabled);
 
+  bool devtoolsEnabled() const;
+  void setDevtoolsEnabled(bool enabled);
+
+  int devtoolsPort() const;
+  void setDevtoolsPort(int port);
+
  protected:
   WebContextAdapter(QObject* q,
                     IOThreadDelegate* io_delegate,

=== modified file 'qt/core/glue/oxide_qt_web_context_adapter_p.h'
--- qt/core/glue/oxide_qt_web_context_adapter_p.h	2014-04-02 19:57:47 +0000
+++ qt/core/glue/oxide_qt_web_context_adapter_p.h	2014-06-24 11:52:03 +0000
@@ -69,6 +69,8 @@
     net::StaticCookiePolicy::Type cookie_policy;
     content::CookieStoreConfig::SessionCookieMode session_cookie_mode;
     bool popup_blocker_enabled;
+    bool devtools_enabled;
+    int devtools_port;
   };
 
   static WebContextAdapterPrivate* Create(

=== modified file 'qt/core/glue/private/oxide_qt_web_context_adapter_p.cc'
--- qt/core/glue/private/oxide_qt_web_context_adapter_p.cc	2014-04-02 19:57:47 +0000
+++ qt/core/glue/private/oxide_qt_web_context_adapter_p.cc	2014-06-24 11:52:03 +0000
@@ -38,13 +38,19 @@
 #include "../oxide_qt_user_script_adapter.h"
 #include "../oxide_qt_user_script_adapter_p.h"
 
+namespace {
+const unsigned kDefaultDevtoolsPort = 8484;
+}
+
 namespace oxide {
 namespace qt {
 
 WebContextAdapterPrivate::ConstructProperties::ConstructProperties() :
     cookie_policy(net::StaticCookiePolicy::ALLOW_ALL_COOKIES),
     session_cookie_mode(content::CookieStoreConfig::EPHEMERAL_SESSION_COOKIES),
-    popup_blocker_enabled(true) {}
+    popup_blocker_enabled(true),
+    devtools_enabled(false),
+    devtools_port(kDefaultDevtoolsPort) {}
 
 // static
 WebContextAdapterPrivate* WebContextAdapterPrivate::Create(
@@ -204,7 +210,9 @@
   oxide::BrowserContext::Params params(
       construct_props_->data_path,
       construct_props_->cache_path,
-      construct_props_->session_cookie_mode);
+      construct_props_->session_cookie_mode,
+      construct_props_->devtools_enabled,
+      construct_props_->devtools_port);
   context_ = oxide::BrowserContext::Create(params);
 
   if (!construct_props_->product.empty()) {

=== modified file 'qt/quick/api/oxideqquickwebcontext.cc'
--- qt/quick/api/oxideqquickwebcontext.cc	2014-06-05 09:51:42 +0000
+++ qt/quick/api/oxideqquickwebcontext.cc	2014-06-24 11:52:03 +0000
@@ -680,4 +680,40 @@
   }
 }
 
+bool OxideQQuickWebContext::devtoolsEnabled() const {
+  Q_D(const OxideQQuickWebContext);
+
+  return d->devtoolsEnabled();
+}
+
+void OxideQQuickWebContext::setDevtoolsEnabled(bool enabled) {
+  Q_D(OxideQQuickWebContext);
+
+  if (d->devtoolsEnabled() == enabled) {
+    return;
+  }
+
+  d->setDevtoolsEnabled(enabled);
+
+  emit devtoolsEnabledChanged();
+}
+
+int OxideQQuickWebContext::devtoolsPort() const {
+  Q_D(const OxideQQuickWebContext);
+
+  return d->devtoolsPort();
+}
+
+void OxideQQuickWebContext::setDevtoolsPort(int port) {
+  Q_D(OxideQQuickWebContext);
+
+  if (d->devtoolsPort() == port) {
+    return;
+  }
+
+  d->setDevtoolsPort(port);
+
+  emit devtoolsPortChanged();
+}
+
 #include "moc_oxideqquickwebcontext_p.cpp"

=== modified file 'qt/quick/api/oxideqquickwebcontext_p.h'
--- qt/quick/api/oxideqquickwebcontext_p.h	2014-04-02 22:32:27 +0000
+++ qt/quick/api/oxideqquickwebcontext_p.h	2014-06-24 11:52:03 +0000
@@ -47,6 +47,8 @@
   Q_PROPERTY(OxideQQuickWebContextDelegateWorker* networkRequestDelegate READ networkRequestDelegate WRITE setNetworkRequestDelegate NOTIFY networkRequestDelegateChanged)
   Q_PROPERTY(OxideQQuickWebContextDelegateWorker* storageAccessPermissionDelegate READ storageAccessPermissionDelegate WRITE setStorageAccessPermissionDelegate NOTIFY storageAccessPermissionDelegateChanged)
   Q_PROPERTY(OxideQQuickWebContextDelegateWorker* userAgentOverrideDelegate READ userAgentOverrideDelegate WRITE setUserAgentOverrideDelegate NOTIFY userAgentOverrideDelegateChanged)
+  Q_PROPERTY(bool devtoolsEnabled READ devtoolsEnabled WRITE setDevtoolsEnabled NOTIFY devtoolsEnabledChanged)
+  Q_PROPERTY(int devtoolsPort READ devtoolsPort WRITE setDevtoolsPort NOTIFY devtoolsPortChanged)
 
   Q_ENUMS(CookiePolicy)
   Q_ENUMS(SessionCookieMode)
@@ -115,6 +117,12 @@
   OxideQQuickWebContextDelegateWorker* userAgentOverrideDelegate() const;
   void setUserAgentOverrideDelegate(OxideQQuickWebContextDelegateWorker* delegate);
 
+  bool devtoolsEnabled() const;
+  void setDevtoolsEnabled(bool enabled);
+
+  int devtoolsPort() const;
+  void setDevtoolsPort(int port);
+
  Q_SIGNALS:
   void productChanged();
   void userAgentChanged();
@@ -128,6 +136,8 @@
   void networkRequestDelegateChanged();
   void storageAccessPermissionDelegateChanged();
   void userAgentOverrideDelegateChanged();
+  void devtoolsEnabledChanged();
+  void devtoolsPortChanged();
 
  private:
   Q_PRIVATE_SLOT(d_func(), void userScriptUpdated());

=== modified file 'shared/browser/oxide_browser_context.h'
--- shared/browser/oxide_browser_context.h	2014-06-19 17:41:21 +0000
+++ shared/browser/oxide_browser_context.h	2014-06-24 11:52:03 +0000
@@ -121,12 +121,20 @@
   struct Params {
     Params(const base::FilePath& path,
            const base::FilePath& cache_path,
-           const content::CookieStoreConfig::SessionCookieMode session_cookie_mode) :
-        path(path), cache_path(cache_path), session_cookie_mode(session_cookie_mode) {}
+           const content::CookieStoreConfig::SessionCookieMode session_cookie_mode,
+	   bool devtools_enabled,
+	   int devtools_port) :
+        path(path),
+	cache_path(cache_path),
+        session_cookie_mode(session_cookie_mode),
+        devtools_enabled(devtools_enabled),
+        devtools_port(devtools_port) {}
 
     base::FilePath path;
     base::FilePath cache_path;
     content::CookieStoreConfig::SessionCookieMode session_cookie_mode;
+    bool devtools_enabled;
+    int devtools_port;
   };
 
   virtual ~BrowserContext();
@@ -180,6 +188,10 @@
   bool IsPopupBlockerEnabled() const;
   virtual void SetIsPopupBlockerEnabled(bool enabled) = 0;
 
+  virtual bool GetDevtoolsEnabled() const = 0;
+
+  virtual int GetDevtoolsPort() const = 0;
+
   BrowserContextIOData* io_data() const { return io_data_handle_.io_data(); }
 
   virtual UserScriptMaster& UserScriptManager() = 0;

=== modified file 'shared/browser/oxide_browser_context_impl.cc'
--- shared/browser/oxide_browser_context_impl.cc	2014-06-02 15:06:30 +0000
+++ shared/browser/oxide_browser_context_impl.cc	2014-06-24 11:52:03 +0000
@@ -20,15 +20,25 @@
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/devtools_http_handler.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/user_agent.h"
+#include "net/socket/tcp_listen_socket.h"
 
 #include "shared/common/chrome_version.h"
 #include "shared/common/oxide_content_client.h"
 #include "shared/common/oxide_messages.h"
 
+
+#include "oxide_devtools_http_handler_delegate.h"
 #include "oxide_off_the_record_browser_context_impl.h"
 
+namespace {
+
+const std::string kDevtoolsServerIp = "127.0.0.1";
+
+}
+
 namespace oxide {
 
 BrowserContextIODataImpl::BrowserContextIODataImpl(
@@ -39,7 +49,8 @@
     accept_langs_("en-us,en"),
     cookie_policy_(net::StaticCookiePolicy::ALLOW_ALL_COOKIES),
     session_cookie_mode_(params.session_cookie_mode),
-    popup_blocker_enabled_(true) {}
+    popup_blocker_enabled_(true) {
+}
 
 net::StaticCookiePolicy::Type BrowserContextIODataImpl::GetCookiePolicy() const {
   base::AutoLock lock(lock_);
@@ -118,6 +129,19 @@
     default_user_agent_string_(true),
     user_script_manager_(this) {
   SetUserAgent(std::string());
+
+  if (params.devtools_enabled &&
+      params.devtools_port < 65535 &&
+      params.devtools_port > 1024) {
+    std::string ip = kDevtoolsServerIp;
+    unsigned port = params.devtools_port;
+    devtools_http_handler_ = content::DevToolsHttpHandler::Start(
+        new net::TCPListenSocketFactory(ip, port),
+        std::string(),
+        new DevtoolsHttpHandlerDelegate(
+          ip, port, this),
+        base::FilePath());
+  }
 }
 
 BrowserContextImpl::~BrowserContextImpl() {
@@ -126,6 +150,7 @@
   CHECK(!otr_context_ || otr_context_->HasOneRef()) <<
       "Unexpected reference count for OTR BrowserContext. Did you use "
       "scoped_refptr instead of ScopedBrowserContext?";
+  devtools_http_handler_->Stop();
 }
 
 BrowserContext* BrowserContextImpl::GetOffTheRecordContext() {
@@ -189,4 +214,12 @@
   return user_script_manager_;
 }
 
+bool BrowserContextImpl::GetDevtoolsEnabled() const FINAL {
+  return devtools_enabled_;
+}
+
+int BrowserContextImpl::GetDevtoolsPort() const FINAL {
+  return devtools_port_;
+}
+
 } // namespace oxide

=== modified file 'shared/browser/oxide_browser_context_impl.h'
--- shared/browser/oxide_browser_context_impl.h	2014-05-22 08:09:28 +0000
+++ shared/browser/oxide_browser_context_impl.h	2014-06-24 11:52:03 +0000
@@ -27,6 +27,10 @@
 #include "oxide_browser_context.h"
 #include "oxide_user_script_master.h"
 
+namespace content {
+class DevToolsHttpHandler;
+}
+
 namespace oxide {
 
 class OffTheRecordBrowserContextImpl;
@@ -85,6 +89,9 @@
   void SetCookiePolicy(net::StaticCookiePolicy::Type policy) FINAL;
   void SetIsPopupBlockerEnabled(bool enabled) FINAL;
 
+  bool GetDevtoolsEnabled() const FINAL;
+  int GetDevtoolsPort() const FINAL;
+
   UserScriptMaster& UserScriptManager() FINAL;
 
  private:
@@ -96,6 +103,9 @@
   std::string product_;
   bool default_user_agent_string_;
   UserScriptMaster user_script_manager_;
+  content::DevToolsHttpHandler* devtools_http_handler_;
+  bool devtools_enabled_;
+  int devtools_port_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserContextImpl);
 };

=== added file 'shared/browser/oxide_devtools_http_handler_delegate.cc'
--- shared/browser/oxide_devtools_http_handler_delegate.cc	1970-01-01 00:00:00 +0000
+++ shared/browser/oxide_devtools_http_handler_delegate.cc	2014-06-24 11:52:03 +0000
@@ -0,0 +1,124 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2013 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "oxide_devtools_http_handler_delegate.h"
+
+#include "base/logging.h"
+#include "base/path_service.h"
+#include "base/strings/string_number_conversions.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/browser/devtools_target.h"
+#include "content/public/browser/devtools_http_handler.h"
+#include "content/public/common/url_constants.h"
+#include "net/socket/tcp_listen_socket.h"
+#include "net/url_request/url_request_context_getter.h"
+#include "ui/base/resource/resource_bundle.h"
+
+#include "oxide_devtools_target.h"
+#include "oxide_io_thread.h"
+#include "oxide_web_view.h"
+
+#include "grit/oxide_resources.h"
+
+using content::DevToolsTarget;
+using content::RenderViewHost;
+using content::WebContents;
+
+
+namespace oxide {
+
+DevtoolsHttpHandlerDelegate::DevtoolsHttpHandlerDelegate(
+      const std::string& ip,
+      unsigned port,
+      BrowserContext * attached_browser_context)
+    : ip_(ip),
+      port_(port),
+      browser_context_(attached_browser_context) {
+    LOG(INFO) << "DevTools instance running "
+	      << GetLocalDevToolsUrl();
+}
+
+DevtoolsHttpHandlerDelegate::~DevtoolsHttpHandlerDelegate() {
+}
+
+std::string DevtoolsHttpHandlerDelegate::GetDiscoveryPageHTML() {
+  return ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
+    IDR_OXIDE_DEVTOOLS_DISCOVERY_HTML_PAGE).as_string();
+}
+
+std::string
+DevtoolsHttpHandlerDelegate::GetLocalDevToolsUrl() const {
+  std::ostringstream oss;
+  oss << "http://"
+      << ip_
+      << ":"
+      << port_;
+  return oss.str();
+}
+
+bool DevtoolsHttpHandlerDelegate::BundlesFrontendResources() {
+  // We reuse the default chrome builtin webui from devtools_resources.pak
+  return true;
+}
+
+base::FilePath DevtoolsHttpHandlerDelegate::GetDebugFrontendDir() {
+  // We dont host the devtools resources & ui (see above).
+  return base::FilePath();
+}
+
+std::string DevtoolsHttpHandlerDelegate::GetPageThumbnailData(
+    const GURL& url) {
+  return std::string();
+}
+
+scoped_ptr<DevToolsTarget>
+DevtoolsHttpHandlerDelegate::CreateNewTarget(const GURL& url) {
+  // Not supported
+  return scoped_ptr<DevToolsTarget>();
+}
+
+void DevtoolsHttpHandlerDelegate::EnumerateTargets(TargetCallback callback) {
+  TargetList targetList;
+  std::set<WebView*> wvl =
+    WebView::GetAllWebViewsFor(browser_context_);
+  if (!wvl.empty()) {
+    std::set<WebView*>::iterator it = wvl.begin();
+    for (; it != wvl.end(); ++it) {
+      DCHECK(*it) << "Invalid WebView instance (NULL)";
+
+      content::WebContents * web_contents =
+	(*it)->GetWebContents();
+      if (web_contents) {
+	// The receiver of the target list is the owner of the content
+	// See content/public/browser/devtools_http_handler_delegate.h
+	targetList.push_back(
+          DevtoolsTarget::CreateForWebContents(web_contents));
+      }
+    }
+  }
+  callback.Run(targetList);
+}
+
+scoped_ptr<net::StreamListenSocket>
+DevtoolsHttpHandlerDelegate::CreateSocketForTethering(
+    net::StreamListenSocket::Delegate* delegate,
+    std::string* name) {
+  // Not supported
+  return scoped_ptr<net::StreamListenSocket>();
+}
+
+}

=== added file 'shared/browser/oxide_devtools_http_handler_delegate.h'
--- shared/browser/oxide_devtools_http_handler_delegate.h	1970-01-01 00:00:00 +0000
+++ shared/browser/oxide_devtools_http_handler_delegate.h	2014-06-24 11:52:03 +0000
@@ -0,0 +1,71 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2014 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_SHARED_BROWSER_DEVTOOLS_HTTP_HANDLER_DELEGATE_H_
+#define _OXIDE_SHARED_BROWSER_DEVTOOLS_HTTP_HANDLER_DELEGATE_H_
+
+#include <string>
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "content/public/browser/devtools_http_handler_delegate.h"
+
+namespace content {
+class DevToolsTarget;
+class DevToolsHttpHandler;
+}
+
+namespace oxide {
+
+class BrowserContext;
+
+class DevtoolsHttpHandlerDelegate
+    : public content::DevToolsHttpHandlerDelegate {
+ public:
+
+  DevtoolsHttpHandlerDelegate(
+      const std::string& ip,
+      unsigned port,
+      BrowserContext* attached_browser_context);
+  virtual ~DevtoolsHttpHandlerDelegate();
+
+  // DevToolsHttpProtocolHandler::Delegate overrides.
+  virtual std::string GetDiscoveryPageHTML() OVERRIDE;
+  virtual bool BundlesFrontendResources() OVERRIDE;
+  virtual base::FilePath GetDebugFrontendDir() OVERRIDE;
+  virtual std::string GetPageThumbnailData(const GURL& url) OVERRIDE;
+  virtual scoped_ptr<content::DevToolsTarget> CreateNewTarget(
+      const GURL& url) OVERRIDE;
+  virtual void EnumerateTargets(TargetCallback callback) OVERRIDE;
+  virtual scoped_ptr<net::StreamListenSocket> CreateSocketForTethering(
+      net::StreamListenSocket::Delegate* delegate,
+      std::string* name) OVERRIDE;
+
+ private:
+
+  std::string GetLocalDevToolsUrl() const;
+
+  std::string ip_;
+  unsigned port_;
+  BrowserContext* browser_context_;
+  DISALLOW_COPY_AND_ASSIGN(DevtoolsHttpHandlerDelegate);
+};
+
+}
+
+#endif  // _OXIDE_SHARED_BROWSER_DEVTOOLS_HTTP_HANDLER_DELEGATE_H_
+

=== added file 'shared/browser/oxide_devtools_target.cc'
--- shared/browser/oxide_devtools_target.cc	1970-01-01 00:00:00 +0000
+++ shared/browser/oxide_devtools_target.cc	2014-06-24 11:52:03 +0000
@@ -0,0 +1,125 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2014 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "oxide_devtools_target.h"
+
+#include "base/logging.h"
+#include "base/strings/utf_string_conversions.h"
+#include "content/public/browser/devtools_agent_host.h"
+#include "content/public/browser/devtools_target.h"
+#include "content/public/browser/devtools_http_handler.h"
+#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_delegate.h"
+#include "content/public/common/url_constants.h"
+
+using content::DevToolsAgentHost;
+using content::DevToolsTarget;
+using content::RenderViewHost;
+using content::WebContents;
+
+namespace oxide {
+
+// static 
+DevtoolsTarget* DevtoolsTarget::CreateForWebContents(
+    content::WebContents * web_contents) {
+  DCHECK(web_contents);
+  return new DevtoolsTarget(web_contents);
+}
+
+DevtoolsTarget::DevtoolsTarget(
+      content::WebContents * wc)
+    : content::WebContentsObserver(wc) {
+  DCHECK(wc);
+
+  agent_host_ = DevToolsAgentHost::GetOrCreateFor(web_contents());
+}
+
+DevtoolsTarget::~DevtoolsTarget() {
+}
+
+std::string DevtoolsTarget::GetId() const {
+  return agent_host_ ? agent_host_->GetId() : std::string();
+}
+
+std::string DevtoolsTarget::GetParentId() const {
+  return std::string();
+}
+
+std::string DevtoolsTarget::GetType() const {
+  return std::string();
+}
+
+std::string DevtoolsTarget::GetTitle() const {
+  const content::WebContents* wc = web_contents();
+  if (!wc) {
+    return std::string();
+  }
+
+  return base::UTF16ToUTF8(wc->GetTitle());
+}
+
+std::string DevtoolsTarget::GetDescription() const {
+  return std::string();
+}
+
+GURL DevtoolsTarget::GetURL() const {
+  const content::WebContents* wc = web_contents();
+  if (!wc) {
+    return GURL();
+  }
+
+  return wc->GetVisibleURL();
+}
+
+GURL DevtoolsTarget::GetFaviconURL() const {
+  return GURL();
+}
+
+base::TimeTicks DevtoolsTarget::GetLastActivityTime() const {
+  const content::WebContents* wc = web_contents();
+  if (!wc) {
+    return base::TimeTicks();
+  }
+
+  return wc->GetLastActiveTime();
+}
+
+bool DevtoolsTarget::IsAttached() const {
+  return agent_host_->IsAttached();
+}
+
+scoped_refptr<DevToolsAgentHost> DevtoolsTarget::GetAgentHost() const {
+  return agent_host_;
+}
+
+bool DevtoolsTarget::Activate() const {
+  content::WebContents* wc = web_contents();
+  if (!wc) {
+    return false;
+  }
+
+  wc->GetDelegate()->ActivateContents(wc);
+  return true;
+}
+
+bool DevtoolsTarget::Close() const {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+}

=== added file 'shared/browser/oxide_devtools_target.h'
--- shared/browser/oxide_devtools_target.h	1970-01-01 00:00:00 +0000
+++ shared/browser/oxide_devtools_target.h	2014-06-24 11:52:03 +0000
@@ -0,0 +1,72 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2014 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_SHARED_BROWSER_DEVTOOLS_TARGET_H_
+#define _OXIDE_SHARED_BROWSER_DEVTOOLS_TARGET_H_
+
+#include <string>
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "content/public/browser/devtools_target.h"
+#include "content/public/browser/web_contents_observer.h"
+
+namespace content {
+class DevToolsTarget;
+class DevToolsAgentHost;
+class RenderViewHost;
+class WebContents;
+}
+
+namespace oxide {
+
+class DevtoolsTarget
+    : public content::DevToolsTarget,
+      public content::WebContentsObserver
+{
+ public:
+
+  virtual ~DevtoolsTarget();
+
+  static DevtoolsTarget * CreateForWebContents(content::WebContents *);
+
+  // DevToolsHttpProtocolHandler::Delegate overrides.
+  virtual std::string GetId() const OVERRIDE;
+  virtual std::string GetParentId() const OVERRIDE;
+  virtual std::string GetType() const OVERRIDE;
+  virtual std::string GetTitle() const OVERRIDE;
+  virtual std::string GetDescription() const OVERRIDE;
+  virtual GURL GetURL() const OVERRIDE;
+  virtual GURL GetFaviconURL() const OVERRIDE;
+  virtual base::TimeTicks GetLastActivityTime() const OVERRIDE;
+  virtual bool IsAttached() const OVERRIDE;
+  virtual scoped_refptr<content::DevToolsAgentHost> GetAgentHost() const OVERRIDE;
+  virtual bool Activate() const OVERRIDE;
+  virtual bool Close() const OVERRIDE;
+
+ private:
+  DevtoolsTarget(content::WebContents * web_contents);
+
+  scoped_refptr<content::DevToolsAgentHost> agent_host_;
+
+  DISALLOW_COPY_AND_ASSIGN(DevtoolsTarget);
+};
+
+}
+
+#endif  // _OXIDE_SHARED_BROWSER_DEVTOOLS_HTTP_HANDLER_DELEGATE_H_
+

=== modified file 'shared/browser/oxide_off_the_record_browser_context_impl.cc'
--- shared/browser/oxide_off_the_record_browser_context_impl.cc	2014-05-22 08:09:28 +0000
+++ shared/browser/oxide_off_the_record_browser_context_impl.cc	2014-06-24 11:52:03 +0000
@@ -112,4 +112,13 @@
   return original_context_->UserScriptManager();
 }
 
+bool OffTheRecordBrowserContextImpl::GetDevtoolsEnabled() const {
+  return original_context_->GetDevtoolsEnabled();
+}
+
+int OffTheRecordBrowserContextImpl::GetDevtoolsPort() const {
+  return original_context_->GetDevtoolsPort();
+}
+
+
 } // namespace oxide

=== modified file 'shared/browser/oxide_off_the_record_browser_context_impl.h'
--- shared/browser/oxide_off_the_record_browser_context_impl.h	2014-05-22 08:09:28 +0000
+++ shared/browser/oxide_off_the_record_browser_context_impl.h	2014-06-24 11:52:03 +0000
@@ -66,6 +66,9 @@
   void SetCookiePolicy(net::StaticCookiePolicy::Type policy) FINAL;
   void SetIsPopupBlockerEnabled(bool enabled) FINAL;
 
+  bool GetDevtoolsEnabled() const FINAL;
+  int GetDevtoolsPort() const FINAL;
+
   UserScriptMaster& UserScriptManager() FINAL;
 
  private:

=== modified file 'shared/browser/oxide_web_view.cc'
--- shared/browser/oxide_web_view.cc	2014-06-19 17:41:21 +0000
+++ shared/browser/oxide_web_view.cc	2014-06-24 11:52:03 +0000
@@ -19,6 +19,7 @@
 
 #include <queue>
 
+#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/supports_user_data.h"
@@ -113,6 +114,27 @@
   view->Init(&params);
 }
 
+typedef std::map<BrowserContext*, std::set<WebView*> > WebViewsPerContextMap;
+base::LazyInstance<WebViewsPerContextMap> g_web_view_per_context;
+
+}
+
+// static
+std::set<WebView*>
+WebView::GetAllWebViewsFor(BrowserContext * browser_context) {
+  std::set<WebView*> webviews;
+  if (!browser_context) {
+    return webviews;
+  }
+  WebViewsPerContextMap::iterator it;
+  for (it = g_web_view_per_context.Get().begin();
+       it != g_web_view_per_context.Get().end();
+       ++it) {
+    if (browser_context->IsSameContext(it->first)) {
+      return it->second;
+    }
+  }
+  return webviews;
 }
 
 void WebView::DispatchLoadFailed(const GURL& validated_url,
@@ -559,9 +581,25 @@
     : web_contents_helper_(NULL),
       initial_preferences_(NULL),
       root_frame_(NULL),
-      is_fullscreen_(false) {}
+      is_fullscreen_(false) {
+}
 
 WebView::~WebView() {
+  BrowserContext* context =
+    GetBrowserContext();
+  WebViewsPerContextMap::iterator it =
+    g_web_view_per_context.Get().find(context);
+  if (it != g_web_view_per_context.Get().end()) {
+    std::set<WebView*>& wvl = it->second;
+    if (wvl.find(this) != wvl.end()) {
+      wvl.erase(this);
+      g_web_view_per_context.Get()[context] = wvl;
+    }
+    if (g_web_view_per_context.Get()[context].empty()) {
+      g_web_view_per_context.Get().erase(context);
+    }
+  }
+
   if (root_frame_) {
     root_frame_->Destroy();
   }
@@ -632,7 +670,22 @@
     SetURL(initial_url_);
     initial_url_ = GURL();
   }
+
   SetIsFullscreen(is_fullscreen_);
+
+  {
+    BrowserContext* context =
+      GetBrowserContext()->GetOriginalContext();
+    WebViewsPerContextMap::iterator it =
+      g_web_view_per_context.Get().find(context);
+    if (it != g_web_view_per_context.Get().end()) {
+      g_web_view_per_context.Get()[context].insert(this);
+    } else {
+      std::set<WebView*> wvl;
+      wvl.insert(this);
+      g_web_view_per_context.Get()[context] = wvl;
+    }
+  }
 }
 
 // static

=== modified file 'shared/browser/oxide_web_view.h'
--- shared/browser/oxide_web_view.h	2014-06-19 17:41:21 +0000
+++ shared/browser/oxide_web_view.h	2014-06-24 11:52:03 +0000
@@ -20,6 +20,7 @@
 
 #include <string>
 #include <vector>
+#include <set>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ -94,6 +95,9 @@
   static WebView* FromWebContents(const content::WebContents* web_contents);
   static WebView* FromRenderViewHost(content::RenderViewHost* rvh);
 
+  static std::set<WebView*> GetAllWebViewsFor(
+      BrowserContext * browser_context);
+
   const GURL& GetURL() const;
   void SetURL(const GURL& url);
 

=== added directory 'shared/browser/resources'
=== added file 'shared/browser/resources/devtools_discovery_page.html'
--- shared/browser/resources/devtools_discovery_page.html	1970-01-01 00:00:00 +0000
+++ shared/browser/resources/devtools_discovery_page.html	2014-06-24 11:52:03 +0000
@@ -0,0 +1,155 @@
+<html>
+<head>
+<title>Inspectable pages</title>
+<style>
+body {
+  background-color: rgb(245, 245, 245);
+  font-family: Helvetica, Arial, sans-serif;
+  text-shadow: rgba(255, 255, 255, 0.496094) 0px 1px 0px;
+}
+
+#caption {
+  color: black;
+  font-size: 16px;
+  margin-top: 30px;
+  margin-bottom: 0px;
+  margin-left: 70px;
+  height: 20px;
+  text-align: left;
+}
+
+#items {
+  display: -webkit-box;
+  margin-left: 60px;
+  margin-right: 60px;
+  -webkit-box-orient: horizontal;
+  -webkit-box-lines: multiple;
+}
+
+.frontend_ref {
+  color: black;
+  text-decoration: initial;
+}
+
+.thumbnail {
+  background-attachment: scroll;
+  background-origin: padding-box;
+  background-repeat: no-repeat;
+  border: 4px solid rgba(184, 184, 184, 1);
+  border-radius: 5px;
+  height: 132px;
+  width: 212px;
+  -webkit-transition-property: background-color, border-color;
+  -webkit-transition: background-color 0.15s, 0.15s;
+  -webkit-transition-delay: 0, 0;
+}
+
+.thumbnail:hover {
+  background-color: rgba(242, 242, 242, 1);
+  border-color: rgba(110, 116, 128, 1);
+  color: black;
+}
+
+.thumbnail.connected {
+  opacity: 0.5;
+}
+
+.thumbnail.connected:hover {
+  border-color: rgba(184, 184, 184, 1);
+  color: rgb(110, 116, 128);
+}
+
+.item {
+  display: inline-block;
+  margin: 5px;
+  margin-top: 15px;
+  height: 162px;
+  vertical-align: top;
+  width: 222px;
+}
+
+.text {
+  background: no-repeat 0;
+  background-size: 16px;
+  font-size: 12px;
+  margin: 4px 0px 0px 4px;
+  overflow: hidden;
+  padding: 2px 0px 0px 20px;
+  text-align: left;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+</style>
+
+<script>
+
+function onLoad() {
+  var tabsListRequest = new XMLHttpRequest();
+  tabsListRequest.open('GET', '/json/list', true);
+  tabsListRequest.onreadystatechange = onReady;
+  tabsListRequest.send();
+}
+
+function onReady() {
+  if(this.readyState == 4 && this.status == 200) {
+    if(this.response != null)
+      var responseJSON = JSON.parse(this.response);
+      for (var i = 0; i < responseJSON.length; ++i)
+        appendItem(responseJSON[i]);
+  }
+}
+
+function overrideFrontendUrl(item) {
+  if (window.location.hash) {
+    var overridden_url = window.location.hash.substr(1);
+    var ws_suffix = item.webSocketDebuggerUrl.replace('ws://', 'ws=');
+    if (overridden_url.indexOf('?') == -1)
+      return overridden_url + '?' + ws_suffix;
+    else
+      return overridden_url + '&' + ws_suffix;
+  }
+  return item.devtoolsFrontendUrl;
+}
+
+function appendItem(item_object) {
+  var frontend_ref;
+  if (item_object.devtoolsFrontendUrl) {
+    frontend_ref = document.createElement('a');
+    frontend_ref.href = overrideFrontendUrl(item_object);
+    frontend_ref.title = item_object.title;
+  } else {
+    frontend_ref = document.createElement('div');
+    frontend_ref.title = 'The tab already has an active debug session';
+  }
+  frontend_ref.className = 'frontend_ref';
+
+  var thumbnail = document.createElement('div');
+  thumbnail.className = item_object.devtoolsFrontendUrl ?
+                        'thumbnail' : 'thumbnail connected';
+  thumbnail.style.cssText = 'background-image:url(' +
+                        item_object.thumbnailUrl +
+                        ')';
+  frontend_ref.appendChild(thumbnail);
+
+  var text = document.createElement('div');
+  text.className = 'text';
+  text.innerText = item_object.description || item_object.title;
+  text.style.cssText = 'background-image:url(' +
+                       item_object.faviconUrl + ')';
+  frontend_ref.appendChild(text);
+
+  var item = document.createElement('p');
+  item.className = 'item';
+  item.appendChild(frontend_ref);
+
+  document.getElementById('items').appendChild(item);
+}
+</script>
+</head>
+<body onload='onLoad()'>
+  <div id='caption'>Inspectable pages</div>
+  <div id='items'>
+  </div>
+  <hr>
+</body>
+</html>

=== modified file 'shared/oxide_resources.grd'
--- shared/oxide_resources.grd	2014-02-28 12:53:41 +0000
+++ shared/oxide_resources.grd	2014-06-24 11:52:03 +0000
@@ -9,6 +9,7 @@
   <release seq="1">
     <includes>
       <include name="IDR_OXIDE_SCRIPT_MESSAGE_MANAGER_BINDINGS_JS" file="renderer/oxide_script_message_manager_bindings.js" type="BINDATA" />
+      <include name="IDR_OXIDE_DEVTOOLS_DISCOVERY_HTML_PAGE" file="browser/resources/devtools_discovery_page.html" type="BINDATA" />
     </includes>
   </release>
 </grit>

=== modified file 'shared/shared.gyp'
--- shared/shared.gyp	2014-06-19 17:41:21 +0000
+++ shared/shared.gyp	2014-06-24 11:52:03 +0000
@@ -42,6 +42,7 @@
       'dependencies': [
         'oxide_extra_resources',
         '<(DEPTH)/content/content_resources.gyp:content_resources',
+        '<(DEPTH)/content/browser/devtools/devtools_resources.gyp:devtools_resources',
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
         '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
@@ -53,6 +54,7 @@
           'variables': {
             'pak_inputs': [
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/oxide/oxide_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
@@ -226,6 +228,10 @@
         'browser/oxide_content_browser_client.cc',
         'browser/oxide_content_browser_client.h',
         'browser/oxide_default_screen_info.h',
+        'browser/oxide_devtools_http_handler_delegate.cc',
+        'browser/oxide_devtools_http_handler_delegate.h',
+        'browser/oxide_devtools_target.cc',
+        'browser/oxide_devtools_target.h',
         'browser/oxide_file_picker.cc',
         'browser/oxide_file_picker.h',
         'browser/oxide_form_factor.h',