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

Side by Side Diff: content/browser/devtools/devtools_http_handler_impl.cc

Issue 730433003: [DevTools] Remote frontend is now embedded to iframe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased, fixed test Created 6 years, 1 month 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <algorithm> 5 #include <algorithm>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 956 matching lines...) Expand 10 before | Expand all | Expand 10 after
967 scoped_ptr<ServerSocketFactory> server_socket_factory, 967 scoped_ptr<ServerSocketFactory> server_socket_factory,
968 const std::string& frontend_url, 968 const std::string& frontend_url,
969 DevToolsHttpHandlerDelegate* delegate, 969 DevToolsHttpHandlerDelegate* delegate,
970 const base::FilePath& output_directory) 970 const base::FilePath& output_directory)
971 : thread_(nullptr), 971 : thread_(nullptr),
972 frontend_url_(frontend_url), 972 frontend_url_(frontend_url),
973 server_wrapper_(nullptr), 973 server_wrapper_(nullptr),
974 delegate_(delegate), 974 delegate_(delegate),
975 weak_factory_(this) { 975 weak_factory_(this) {
976 if (frontend_url_.empty()) 976 if (frontend_url_.empty())
977 frontend_url_ = "/devtools/devtools.html"; 977 frontend_url_ = "/devtools/inspector.html";
978 978
979 BrowserThread::PostTask( 979 BrowserThread::PostTask(
980 BrowserThread::FILE, FROM_HERE, 980 BrowserThread::FILE, FROM_HERE,
981 base::Bind(&StartServerOnFile, 981 base::Bind(&StartServerOnFile,
982 weak_factory_.GetWeakPtr(), 982 weak_factory_.GetWeakPtr(),
983 base::Passed(&server_socket_factory), 983 base::Passed(&server_socket_factory),
984 output_directory, 984 output_directory,
985 delegate_->GetDebugFrontendDir(), 985 delegate_->GetDebugFrontendDir(),
986 delegate_->BundlesFrontendResources())); 986 delegate_->BundlesFrontendResources()));
987 } 987 }
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 id.c_str(), 1132 id.c_str(),
1133 host); 1133 host);
1134 dictionary->SetString( 1134 dictionary->SetString(
1135 kTargetDevtoolsFrontendUrlField, devtools_frontend_url); 1135 kTargetDevtoolsFrontendUrlField, devtools_frontend_url);
1136 } 1136 }
1137 1137
1138 return dictionary; 1138 return dictionary;
1139 } 1139 }
1140 1140
1141 } // namespace content 1141 } // namespace content
OLDNEW
« no previous file with comments | « chromecast/browser/devtools/remote_debugging_server.cc ('k') | content/shell/browser/shell_devtools_manager_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698