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

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

Issue 21682002: Expose GPU information to Telemetry. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Refactored more code into WebSocketBrowserConnection on nduca's request. Created 7 years, 4 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
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 "content/browser/devtools/devtools_http_handler_impl.h" 5 #include "content/browser/devtools/devtools_http_handler_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/file_util.h" 12 #include "base/file_util.h"
13 #include "base/json/json_writer.h" 13 #include "base/json/json_writer.h"
14 #include "base/lazy_instance.h" 14 #include "base/lazy_instance.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "base/message_loop/message_loop_proxy.h" 16 #include "base/message_loop/message_loop_proxy.h"
17 #include "base/stl_util.h" 17 #include "base/stl_util.h"
18 #include "base/strings/string_number_conversions.h" 18 #include "base/strings/string_number_conversions.h"
19 #include "base/strings/utf_string_conversions.h" 19 #include "base/strings/utf_string_conversions.h"
20 #include "base/threading/thread.h" 20 #include "base/threading/thread.h"
21 #include "base/values.h" 21 #include "base/values.h"
22 #include "content/browser/devtools/devtools_browser_target.h" 22 #include "content/browser/devtools/devtools_browser_target.h"
23 #include "content/browser/devtools/devtools_protocol.h" 23 #include "content/browser/devtools/devtools_protocol.h"
24 #include "content/browser/devtools/devtools_protocol_constants.h" 24 #include "content/browser/devtools/devtools_protocol_constants.h"
25 #include "content/browser/devtools/devtools_system_info_handler.h"
25 #include "content/browser/devtools/devtools_tracing_handler.h" 26 #include "content/browser/devtools/devtools_tracing_handler.h"
26 #include "content/browser/devtools/tethering_handler.h" 27 #include "content/browser/devtools/tethering_handler.h"
27 #include "content/browser/web_contents/web_contents_impl.h" 28 #include "content/browser/web_contents/web_contents_impl.h"
28 #include "content/common/devtools_messages.h" 29 #include "content/common/devtools_messages.h"
29 #include "content/public/browser/browser_thread.h" 30 #include "content/public/browser/browser_thread.h"
30 #include "content/public/browser/devtools_agent_host.h" 31 #include "content/public/browser/devtools_agent_host.h"
31 #include "content/public/browser/devtools_client_host.h" 32 #include "content/public/browser/devtools_client_host.h"
32 #include "content/public/browser/devtools_http_handler_delegate.h" 33 #include "content/public/browser/devtools_http_handler_delegate.h"
33 #include "content/public/browser/devtools_manager.h" 34 #include "content/public/browser/devtools_manager.h"
34 #include "content/public/browser/favicon_status.h" 35 #include "content/public/browser/favicon_status.h"
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 browser_target_ = new DevToolsBrowserTarget( 377 browser_target_ = new DevToolsBrowserTarget(
377 thread_->message_loop_proxy().get(), server_.get(), connection_id); 378 thread_->message_loop_proxy().get(), server_.get(), connection_id);
378 browser_target_->RegisterDomainHandler( 379 browser_target_->RegisterDomainHandler(
379 devtools::Tracing::kName, 380 devtools::Tracing::kName,
380 new DevToolsTracingHandler(), 381 new DevToolsTracingHandler(),
381 true /* handle on UI thread */); 382 true /* handle on UI thread */);
382 browser_target_->RegisterDomainHandler( 383 browser_target_->RegisterDomainHandler(
383 TetheringHandler::kDomain, 384 TetheringHandler::kDomain,
384 new TetheringHandler(delegate_.get()), 385 new TetheringHandler(delegate_.get()),
385 false /* handle on this thread */); 386 false /* handle on this thread */);
387 browser_target_->RegisterDomainHandler(
388 devtools::SystemInfo::kName,
389 new DevToolsSystemInfoHandler(),
390 true /* handle on UI thread */);
386 391
387 server_->AcceptWebSocket(connection_id, request); 392 server_->AcceptWebSocket(connection_id, request);
388 return; 393 return;
389 } 394 }
390 395
391 BrowserThread::PostTask( 396 BrowserThread::PostTask(
392 BrowserThread::UI, 397 BrowserThread::UI,
393 FROM_HERE, 398 FROM_HERE,
394 base::Bind( 399 base::Bind(
395 &DevToolsHttpHandlerImpl::OnWebSocketRequestUI, 400 &DevToolsHttpHandlerImpl::OnWebSocketRequestUI,
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 host.c_str(), 862 host.c_str(),
858 kPageUrlPrefix, 863 kPageUrlPrefix,
859 id.c_str())); 864 id.c_str()));
860 std::string devtools_frontend_url = GetFrontendURLInternal( 865 std::string devtools_frontend_url = GetFrontendURLInternal(
861 id.c_str(), 866 id.c_str(),
862 host); 867 host);
863 dictionary->SetString(kTargetDevtoolsFrontendUrlField, devtools_frontend_url); 868 dictionary->SetString(kTargetDevtoolsFrontendUrlField, devtools_frontend_url);
864 } 869 }
865 870
866 } // namespace content 871 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698