Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / browser / devtools / xwalk_devtools_delegate.cc

diff --git a/src/xwalk/runtime/browser/devtools/xwalk_devtools_delegate.cc b/src/xwalk/runtime/browser/devtools/xwalk_devtools_delegate.cc
index 3df59c7..18583a1 100644 (file)
--- a/src/xwalk/runtime/browser/devtools/xwalk_devtools_delegate.cc
+++ b/src/xwalk/runtime/browser/devtools/xwalk_devtools_delegate.cc
@@ -39,8 +39,8 @@ class Target : public content::DevToolsTarget {
  public:
   explicit Target(scoped_refptr<content::DevToolsAgentHost> agent_host);
 
-  virtual std::string GetId() const OVERRIDE { return agent_host_->GetId(); }
-  virtual std::string GetType() const OVERRIDE {
+  std::string GetId() const override { return agent_host_->GetId(); }
+  std::string GetType() const override {
       switch (agent_host_->GetType()) {
         case content::DevToolsAgentHost::TYPE_WEB_CONTENTS:
            return kTargetTypePage;
@@ -51,24 +51,24 @@ class Target : public content::DevToolsTarget {
        }
        return kTargetTypeOther;
      }
-  virtual std::string GetTitle() const OVERRIDE {
+  std::string GetTitle() const override {
     return agent_host_->GetTitle();
   }
-  virtual std::string GetDescription() const OVERRIDE { return std::string(); }
-  virtual GURL GetURL() const OVERRIDE { return  agent_host_->GetURL(); }
-  virtual GURL GetFaviconURL() const OVERRIDE { return favicon_url_; }
-  virtual base::TimeTicks GetLastActivityTime() const OVERRIDE {
+  std::string GetDescription() const override { return std::string(); }
+  GURL GetURL() const override { return  agent_host_->GetURL(); }
+  GURL GetFaviconURL() const override { return favicon_url_; }
+  base::TimeTicks GetLastActivityTime() const override {
     return last_activity_time_;
   }
-  virtual std::string GetParentId() const OVERRIDE { return std::string(); }
-  virtual bool IsAttached() const OVERRIDE {
+  std::string GetParentId() const override { return std::string(); }
+  bool IsAttached() const override {
     return agent_host_->IsAttached();
   }
-  virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const OVERRIDE {
+  scoped_refptr<DevToolsAgentHost> GetAgentHost() const override {
     return agent_host_;
   }
-  virtual bool Activate() const OVERRIDE;
-  virtual bool Close() const OVERRIDE;
+  bool Activate() const override;
+  bool Close() const override;
 
  private:
   GURL GetFaviconDataURL(WebContents* web_contents) const;
@@ -222,7 +222,8 @@ std::string XWalkDevToolsDelegate::GetPageThumbnailData(const GURL& url) {
 scoped_ptr<content::DevToolsTarget>
 XWalkDevToolsDelegate::CreateNewTarget(const GURL& url) {
   Runtime* runtime = CreateWithDefaultWindow(
-      browser_context_, GURL(url::kAboutBlankURL), this);
+      browser_context_, url, this);
+  runtime->set_remote_debugging_enabled(true);
   return scoped_ptr<content::DevToolsTarget>(
       new Target(DevToolsAgentHost::GetOrCreateFor(runtime->web_contents())));
 }