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

Side by Side Diff: chrome/browser/debugger/dev_tools_view.cc

Issue 40222: Serve developer tools content from chrome-ui://devtools url (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/dom_ui/chrome_url_data_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/debugger/dev_tools_view.h" 5 #include "chrome/browser/debugger/dev_tools_view.h"
6 6
7 #include <string>
8
7 #include "chrome/browser/browser_list.h" 9 #include "chrome/browser/browser_list.h"
8 #include "chrome/browser/profile.h" 10 #include "chrome/browser/profile.h"
9 #include "chrome/browser/tab_contents/web_contents.h" 11 #include "chrome/browser/tab_contents/web_contents.h"
10 #include "chrome/browser/views/tab_contents_container_view.h" 12 #include "chrome/browser/views/tab_contents_container_view.h"
11 #include "chrome/common/property_bag.h" 13 #include "chrome/common/property_bag.h"
12 #include "chrome/common/render_messages.h" 14 #include "chrome/common/render_messages.h"
15 #include "chrome/common/url_constants.h"
13 16
14 DevToolsView::DevToolsView(int inspected_process_id, int inspected_view_id) 17 DevToolsView::DevToolsView(int inspected_process_id, int inspected_view_id)
15 : inspected_process_id_(inspected_process_id), 18 : inspected_process_id_(inspected_process_id),
16 inspected_view_id_(inspected_view_id), 19 inspected_view_id_(inspected_view_id),
17 web_contents_(NULL) { 20 web_contents_(NULL) {
18 web_container_ = new TabContentsContainerView(); 21 web_container_ = new TabContentsContainerView();
19 AddChildView(web_container_); 22 AddChildView(web_container_);
20 } 23 }
21 24
22 DevToolsView::~DevToolsView() { 25 DevToolsView::~DevToolsView() {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 TabContents* tc = TabContents::CreateWithType(TAB_CONTENTS_DOM_UI, profile, 64 TabContents* tc = TabContents::CreateWithType(TAB_CONTENTS_DOM_UI, profile,
62 NULL); 65 NULL);
63 web_contents_ = tc->AsWebContents(); 66 web_contents_ = tc->AsWebContents();
64 web_contents_->SetupController(profile); 67 web_contents_->SetupController(profile);
65 web_contents_->set_delegate(this); 68 web_contents_->set_delegate(this);
66 web_container_->SetTabContents(web_contents_); 69 web_container_->SetTabContents(web_contents_);
67 web_contents_->render_view_host()->AllowDOMUIBindings(); 70 web_contents_->render_view_host()->AllowDOMUIBindings();
68 web_contents_->render_view_host()->SetInspectedView(inspected_process_id_, 71 web_contents_->render_view_host()->SetInspectedView(inspected_process_id_,
69 inspected_view_id_); 72 inspected_view_id_);
70 73
71 GURL contents("chrome-ui://inspector/debugger-oop.html"); 74 // chrome-ui://devtools/tools.html
75 GURL contents(std::string(chrome::kChromeUIScheme) + "://" +
76 chrome::kDevToolsHost + "/tools.html");
77
72 // this will call CreateRenderView to create renderer process 78 // this will call CreateRenderView to create renderer process
73 web_contents_->controller()->LoadURL(contents, GURL(), 79 web_contents_->controller()->LoadURL(contents, GURL(),
74 PageTransition::START_PAGE); 80 PageTransition::START_PAGE);
75 } 81 }
76 82
77 void DevToolsView::OnWindowClosing() { 83 void DevToolsView::OnWindowClosing() {
78 web_container_->SetTabContents(NULL); // detach last (and only) tab 84 web_container_->SetTabContents(NULL); // detach last (and only) tab
79 web_contents_->CloseContents(); // destroy the tab and navigation controller 85 web_contents_->CloseContents(); // destroy the tab and navigation controller
80 } 86 }
81 87
82 void DevToolsView::OpenURLFromTab(TabContents* source, 88 void DevToolsView::OpenURLFromTab(TabContents* source,
83 const GURL& url, const GURL& referrer, 89 const GURL& url, const GURL& referrer,
84 WindowOpenDisposition disposition, 90 WindowOpenDisposition disposition,
85 PageTransition::Type transition) { 91 PageTransition::Type transition) {
86 NOTREACHED(); 92 NOTREACHED();
87 } 93 }
88 94
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/dom_ui/chrome_url_data_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698