DevTools: init devtools with proper profile.

Review URL: http://codereview.chromium.org/115463

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16275 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 14 insertions, 11 deletions

diff --git a/chrome/browser/debugger/devtools_manager.cc b/chrome/browser/debugger/devtools_manager.cc
index 94d2868..3510df5 100644
--- a/chrome/browser/debugger/devtools_manager.cc
+++ b/chrome/browser/debugger/devtools_manager.cc
@@ -89,7 +89,7 @@ void DevToolsManager::ForwardToDevToolsClient(RenderViewHost* inspected_rvh,
 void DevToolsManager::OpenDevToolsWindow(RenderViewHost* inspected_rvh) {
   DevToolsClientHost* host = GetDevToolsClientHostFor(inspected_rvh);
   if (!host) {
-    host = DevToolsWindow::Create();
+    host = DevToolsWindow::Create(inspected_rvh->delegate()->GetProfile());
     RegisterDevToolsClientHostFor(inspected_rvh, host);
   }
   TabContents* tab_contents = inspected_rvh->delegate()->GetAsTabContents();
diff --git a/chrome/browser/debugger/devtools_view.cc b/chrome/browser/debugger/devtools_view.cc
index 46ee9fc..68e9d4d 100644
--- a/chrome/browser/debugger/devtools_view.cc
+++ b/chrome/browser/debugger/devtools_view.cc
@@ -18,7 +18,9 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 
-DevToolsView::DevToolsView() : tab_contents_(NULL) {
+DevToolsView::DevToolsView(Profile* profile)
+    : tab_contents_(NULL),
+      profile_(profile) {
   web_container_ = new TabContentsContainerView();
   AddChildView(web_container_);
 }
@@ -50,9 +52,7 @@ void DevToolsView::ViewHierarchyChanged(bool is_add,
 void DevToolsView::Init() {
   // We can't create the TabContents until we've actually been put into a real
   // view hierarchy somewhere.
-  Profile* profile = BrowserList::GetLastActive()->profile();
-
-  tab_contents_ = new TabContents(profile, NULL, MSG_ROUTING_NONE, NULL);
+  tab_contents_ = new TabContents(profile_, NULL, MSG_ROUTING_NONE, NULL);
   tab_contents_->set_delegate(this);
   web_container_->SetTabContents(tab_contents_);
   tab_contents_->render_view_host()->AllowDOMUIBindings();
diff --git a/chrome/browser/debugger/devtools_view.h b/chrome/browser/debugger/devtools_view.h
index 3762f2e..6658bec 100644
--- a/chrome/browser/debugger/devtools_view.h
+++ b/chrome/browser/debugger/devtools_view.h
@@ -16,6 +16,7 @@ namespace IPC {
 class Message;
 }
 
+class Profile;
 class RenderViewHost;
 class TabContentsContainerView;
 class TabContents;
@@ -23,7 +24,7 @@ class TabContents;
 class DevToolsView : public views::View,
                      public TabContentsDelegate {
  public:
-  explicit DevToolsView();
+  explicit DevToolsView(Profile* profile);
   virtual ~DevToolsView();
 
   // Destroy content views when the window is closing.
@@ -70,6 +71,7 @@ class DevToolsView : public views::View,
 
   TabContents* tab_contents_;
   TabContentsContainerView* web_container_;
+  Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(DevToolsView);
 };
diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h
index 3a911f4..03a6ae3 100644
--- a/chrome/browser/debugger/devtools_window.h
+++ b/chrome/browser/debugger/devtools_window.h
@@ -8,12 +8,13 @@
 #include "base/basictypes.h"
 #include "chrome/browser/debugger/devtools_client_host.h"
 
+class Profile;
 class RenderViewHost;
 
 class DevToolsWindow : public DevToolsClientHost {
  public:
   // Factory method for creating platform specific devtools windows.
-  static DevToolsWindow* Create();
+  static DevToolsWindow* Create(Profile* profile);
 
   virtual ~DevToolsWindow() {}
 
diff --git a/chrome/browser/debugger/devtools_window_gtk.cc b/chrome/browser/debugger/devtools_window_gtk.cc
index 99b37c7..e2b1219 100644
--- a/chrome/browser/debugger/devtools_window_gtk.cc
+++ b/chrome/browser/debugger/devtools_window_gtk.cc
@@ -7,7 +7,7 @@
 #include "base/logging.h"
 
 // static
-DevToolsWindow* DevToolsWindow::Create() {
+DevToolsWindow* DevToolsWindow::Create(Profile* profile) {
   NOTIMPLEMENTED();
   return NULL;
 }
diff --git a/chrome/browser/debugger/devtools_window_mac.cc b/chrome/browser/debugger/devtools_window_mac.cc
index 99b37c7..e2b1219 100644
--- a/chrome/browser/debugger/devtools_window_mac.cc
+++ b/chrome/browser/debugger/devtools_window_mac.cc
@@ -7,7 +7,7 @@
 #include "base/logging.h"
 
 // static
-DevToolsWindow* DevToolsWindow::Create() {
+DevToolsWindow* DevToolsWindow::Create(Profile* profile) {
   NOTIMPLEMENTED();
   return NULL;
 }
diff --git a/chrome/browser/debugger/devtools_window_win.cc b/chrome/browser/debugger/devtools_window_win.cc
index 9e4cbfe..559016a 100644
--- a/chrome/browser/debugger/devtools_window_win.cc
+++ b/chrome/browser/debugger/devtools_window_win.cc
@@ -12,8 +12,8 @@
 #include "grit/generated_resources.h"
 
 // static
-DevToolsWindow* DevToolsWindow::Create() {
-  DevToolsView* view = new DevToolsView();
+DevToolsWindow* DevToolsWindow::Create(Profile* profile) {
+  DevToolsView* view = new DevToolsView(profile);
   DevToolsWindowWin* window = new DevToolsWindowWin(view);
   views::Window::CreateChromeWindow(NULL, gfx::Rect(), window);
   return window;