Add UI DevTools under chrome://inspect/#other

components/ui_devtools/devtools_server.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/ui_devtools/devtools_server.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "components/ui_devtools/switches.h"
 #include "net/base/net_errors.h"
 #include "net/log/net_log.h"
 #include "net/server/http_server_request_info.h"
 #include "net/socket/server_socket.h"
 #include "net/socket/tcp_server_socket.h"
 
 namespace ui {
 namespace devtools {
 
 namespace {
 const char kChromeDeveloperToolsPrefix[] =
     "chrome-devtools://devtools/bundled/inspector.html?ws=";
+
+bool IsUiDevToolsEnabled() {
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(kEnableUiDevTools);
+}
+
+int GetUiDevToolsPort() {
+  DCHECK(IsUiDevToolsEnabled());
+  int port = 9223;  // Default port is 9223
+  base::StringToInt(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(

[sadrul, 2016/11/17 18:40:57]

StringToInt is expected to leave |port| unchanged if it can't parse correctly?

[Sarmad Hashmi, 2016/11/21 17:18:24]

Just checked, it doesn't. Sets it to various values depending on the error and
returns false (if error). We could have a DCHECK here that asserts true, or we
could set to 9223 if StringToInt returns false. What do you think?

[sadrul, 2016/11/21 18:26:39]

I think we should set to default if StringToInt() fails. So:
  constexprt int kDefaultPort = 9223;
  int port;
  if (!StringToInt(...))
    port = kDefaultPort;

[Sarmad Hashmi, 2016/11/22 04:39:32]

Done.

+                        kEnableUiDevTools),
+                    &port);
+  return port;
+}
+
 }  // namespace
 
+UiDevToolsServer* UiDevToolsServer::devtools_server_ = nullptr;
+
 UiDevToolsServer::UiDevToolsServer(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner)
     : task_runner_(task_runner) {
   if (task_runner_)

[sadrul, 2016/11/17 18:40:57]

You need to set |devtools_server_| before the early return. DCHECK() that
devtools_server_ is nullptr in this ctor.

[Sarmad Hashmi, 2016/11/21 17:18:24]

Done.

     return;
   // If task_runner not passed in, create an I/O thread the server can run on
   thread_.reset(new base::Thread("UiDevToolsServerThread"));
   base::Thread::Options options;
   options.message_loop_type = base::MessageLoop::TYPE_IO;
   CHECK(thread_->StartWithOptions(options));
   task_runner_ = thread_->task_runner();
+  devtools_server_ = this;
 }
 
-UiDevToolsServer::~UiDevToolsServer() {}
+UiDevToolsServer::~UiDevToolsServer() {
+  devtools_server_ = nullptr;
+}
 
 // static
 std::unique_ptr<UiDevToolsServer> UiDevToolsServer::Create(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
   std::unique_ptr<UiDevToolsServer> server;
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(kEnableUiDevTools)) {
+  if (IsUiDevToolsEnabled() && !devtools_server_) {
     // TODO(mhashmi): Change port if more than one inspectable clients
-    int port = 9223;  // Default port is 9223
-    base::StringToInt(
-        base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-            kEnableUiDevTools),
-        &port);
     server.reset(new UiDevToolsServer(task_runner));
-    server->Start("127.0.0.1", port);
+    server->Start("127.0.0.1", GetUiDevToolsPort());
   }
   return server;
 }
 
+// static
+std::vector<UiDevToolsServer::NameUrlPair>
+UiDevToolsServer::GetClientNamesAndUrls() {
+  std::vector<NameUrlPair> pairs;
+  if (!devtools_server_)
+    return pairs;
+
+  for (ClientsList::size_type i = 0; i != devtools_server_->clients_.size();
+       i++) {
+    pairs.push_back(std::pair<std::string, std::string>(
+        devtools_server_->clients_[i]->name(),
+        base::StringPrintf("%slocalhost:%d/%" PRIuS,
+                           kChromeDeveloperToolsPrefix, GetUiDevToolsPort(),
+                           i)));
+  }
+  return pairs;
+}
+
 void UiDevToolsServer::AttachClient(std::unique_ptr<UiDevToolsClient> client) {
   clients_.push_back(std::move(client));
 }
 
 void UiDevToolsServer::SendOverWebSocket(int connection_id,
                                          const String& message) {
   task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&net::HttpServer::SendOverWebSocket,
                  base::Unretained(server_.get()), connection_id, message));
@@ skipping 17 matching lines @@
   server_ = base::MakeUnique<net::HttpServer>(std::move(socket), this);
 }
 
 // HttpServer::Delegate Implementation
 void UiDevToolsServer::OnConnect(int connection_id) {
   NOTIMPLEMENTED();
 }
 
 void UiDevToolsServer::OnHttpRequest(int connection_id,
                                      const net::HttpServerRequestInfo& info) {
-  // Display a simple html page with all the clients and the corresponding
-  // devtools links
-  // TODO(mhashmi): Remove and display all clients under chrome://inspect/#other
-  if (info.path.empty() || info.path == "/") {
-    std::string clientHTML = "<html>";
-    clientHTML +=
-        "<h3>Copy paste the corresponding links in your browser to inspect "
-        "them:</h3>";
-    net::IPEndPoint ip;
-    server_->GetLocalAddress(&ip);
-    for (ClientsList::size_type i = 0; i != clients_.size(); i++) {
-      clientHTML += base::StringPrintf(
-          "<p><strong>%s</strong> (%s%s/%" PRIuS ")</p>",
-          clients_[i]->name().c_str(), kChromeDeveloperToolsPrefix,
-          ip.ToString().c_str(), i);
-    }
-    clientHTML += "</html>";
-    task_runner_->PostTask(
-        FROM_HERE,
-        base::Bind(&net::HttpServer::Send200, base::Unretained(server_.get()),
-                   connection_id, clientHTML, "text/html"));
-    return;
-  }
-  task_runner_->PostTask(
-      FROM_HERE, base::Bind(&net::HttpServer::Send404,
-                            base::Unretained(server_.get()), connection_id));
+  NOTIMPLEMENTED();
 }
 
 void UiDevToolsServer::OnWebSocketRequest(
     int connection_id,
     const net::HttpServerRequestInfo& info) {
   size_t target_id = 0;
   if (info.path.empty() ||
       !base::StringToSizeT(info.path.substr(1), &target_id) ||
       target_id > clients_.size())
     return;
@@ skipping 25 matching lines @@
   if (it == connections_.end())
     return;
   UiDevToolsClient* client = it->second;
   DCHECK(client);
   client->Disconnect();
   connections_.erase(it);
 }
 
 }  // namespace devtools
 }  // namespace ui