diff --git a/brightray/browser/views/inspectable_web_contents_view_views.cc b/brightray/browser/views/inspectable_web_contents_view_views.cc
index 9092d79a3e7e..b2013dc85e7f 100644
--- a/brightray/browser/views/inspectable_web_contents_view_views.cc
+++ b/brightray/browser/views/inspectable_web_contents_view_views.cc
@@ -2,11 +2,57 @@
 
 #include "browser/inspectable_web_contents_impl.h"
 
+#include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ui/views/controls/webview/webview.h"
+#include "ui/views/widget/widget.h"
+#include "ui/views/widget/widget_delegate.h"
+#include "ui/views/window/client_view.h"
 
 namespace brightray {
 
+namespace {
+
+class DevToolsWindowDelegate : public views::ClientView,
+                               public views::WidgetDelegate {
+ public:
+  DevToolsWindowDelegate(InspectableWebContentsViewViews* shell,
+                         views::View* view,
+                         views::Widget* widget)
+      : views::ClientView(widget_, view),
+        shell_(shell),
+        view_(view),
+        widget_(widget),
+        title_(base::ASCIIToUTF16("Developer Tools")) {}
+  virtual ~DevToolsWindowDelegate() {}
+
+  // views::WidgetDelegate:
+  virtual views::View* GetInitiallyFocusedView() OVERRIDE { return view_; }
+  virtual bool CanResize() const OVERRIDE { return true; }
+  virtual bool CanMaximize() const OVERRIDE { return true; }
+  virtual base::string16 GetWindowTitle() const OVERRIDE { return title_; }
+  virtual views::Widget* GetWidget() OVERRIDE { return widget_; }
+  virtual const views::Widget* GetWidget() const OVERRIDE { return widget_; }
+  virtual views::View* GetContentsView() OVERRIDE { return view_; }
+  virtual views::ClientView* CreateClientView(views::Widget* widget) { return this; }
+
+  // views::ClientView:
+  virtual bool CanClose() OVERRIDE {
+    shell_->inspectable_web_contents()->CloseDevTools();
+    return false;
+  }
+
+ private:
+  InspectableWebContentsViewViews* shell_;
+  views::View* view_;
+  views::Widget* widget_;
+  base::string16 title_;
+
+  DISALLOW_COPY_AND_ASSIGN(DevToolsWindowDelegate);
+};
+
+}  // namespace
+
 InspectableWebContentsView* CreateInspectableContentsView(
     InspectableWebContentsImpl* inspectable_web_contents) {
   return new InspectableWebContentsViewViews(inspectable_web_contents);
@@ -15,8 +61,10 @@ InspectableWebContentsView* CreateInspectableContentsView(
 InspectableWebContentsViewViews::InspectableWebContentsViewViews(
     InspectableWebContentsImpl* inspectable_web_contents)
     : inspectable_web_contents_(inspectable_web_contents),
+      devtools_window_web_view_(NULL),
       contents_web_view_(new views::WebView(NULL)),
-      devtools_web_view_(new views::WebView(NULL)) {
+      devtools_web_view_(new views::WebView(NULL)),
+      devtools_visible_(false) {
   set_owned_by_client();
 
   devtools_web_view_->SetVisible(false);
@@ -41,28 +89,61 @@ gfx::NativeView InspectableWebContentsViewViews::GetNativeView() const {
 }
 
 void InspectableWebContentsViewViews::ShowDevTools() {
-  if (devtools_web_view_->visible())
+  if (devtools_visible_)
     return;
 
-  devtools_web_view_->SetVisible(true);
-  devtools_web_view_->SetWebContents(inspectable_web_contents_->devtools_web_contents());
-  Layout();
+  devtools_visible_ = true;
+  if (devtools_window_) {
+    devtools_window_web_view_->SetWebContents(inspectable_web_contents_->devtools_web_contents());
+    devtools_window_->CenterWindow(gfx::Size(800, 600));
+    devtools_window_->Show();
+  } else {
+    devtools_web_view_->SetVisible(true);
+    devtools_web_view_->SetWebContents(inspectable_web_contents_->devtools_web_contents());
+    devtools_web_view_->RequestFocus();
+    Layout();
+  }
 }
 
 void InspectableWebContentsViewViews::CloseDevTools() {
-  if (!devtools_web_view_->visible())
+  if (!devtools_visible_)
     return;
 
-  devtools_web_view_->SetVisible(false);
-  devtools_web_view_->SetWebContents(NULL);
-  Layout();
+  devtools_visible_ = false;
+  if (devtools_window_) {
+    devtools_window_.reset();
+    devtools_window_web_view_ = NULL;
+  } else {
+    devtools_web_view_->SetVisible(false);
+    devtools_web_view_->SetWebContents(NULL);
+    Layout();
+  }
 }
 
 bool InspectableWebContentsViewViews::IsDevToolsViewShowing() {
-  return devtools_web_view_->visible();
+  return devtools_visible_;
 }
 
 void InspectableWebContentsViewViews::SetIsDocked(bool docked) {
+  CloseDevTools();
+
+  if (!docked) {
+    devtools_window_.reset(new views::Widget);
+    devtools_window_web_view_ = new views::WebView(NULL);
+
+    views::Widget::InitParams params;
+    params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+    // The delegate is also a ClientView, so it would deleted when the view
+    // destructs, no need to delete it in DeleteDelegate.
+    params.delegate = new DevToolsWindowDelegate(this,
+                                                 devtools_window_web_view_,
+                                                 devtools_window_.get());
+    params.top_level = true;
+    params.remove_standard_frame = true;
+    devtools_window_->Init(params);
+  }
+
+  ShowDevTools();
 }
 
 void InspectableWebContentsViewViews::SetContentsResizingStrategy(
diff --git a/brightray/browser/views/inspectable_web_contents_view_views.h b/brightray/browser/views/inspectable_web_contents_view_views.h
index 91d31de6f49c..319f1bd6c023 100644
--- a/brightray/browser/views/inspectable_web_contents_view_views.h
+++ b/brightray/browser/views/inspectable_web_contents_view_views.h
@@ -45,10 +45,13 @@ class InspectableWebContentsViewViews : public InspectableWebContentsView,
   // Owns us.
   InspectableWebContentsImpl* inspectable_web_contents_;
 
+  scoped_ptr<views::Widget> devtools_window_;
+  views::WebView* devtools_window_web_view_;
   views::WebView* contents_web_view_;
   views::WebView* devtools_web_view_;
 
   DevToolsContentsResizingStrategy strategy_;
+  bool devtools_visible_;
 
   DISALLOW_COPY_AND_ASSIGN(InspectableWebContentsViewViews);
 };