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

Side by Side Diff: content/renderer/devtools/devtools_agent.cc

Issue 2082343002: Remove calls to deprecated MessageLoop methods in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CR Created 4 years, 5 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
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/renderer/devtools/devtools_agent.h" 5 #include "content/renderer/devtools/devtools_agent.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <map> 9 #include <map>
10 10
11 #include "base/json/json_writer.h" 11 #include "base/json/json_writer.h"
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "base/run_loop.h"
14 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
15 #include "base/trace_event/trace_event.h" 16 #include "base/trace_event/trace_event.h"
16 #include "content/common/devtools_messages.h" 17 #include "content/common/devtools_messages.h"
17 #include "content/common/frame_messages.h" 18 #include "content/common/frame_messages.h"
18 #include "content/public/common/manifest.h" 19 #include "content/public/common/manifest.h"
19 #include "content/renderer/devtools/devtools_client.h" 20 #include "content/renderer/devtools/devtools_client.h"
20 #include "content/renderer/devtools/devtools_cpu_throttler.h" 21 #include "content/renderer/devtools/devtools_cpu_throttler.h"
21 #include "content/renderer/manifest/manifest_manager.h" 22 #include "content/renderer/manifest/manifest_manager.h"
22 #include "content/renderer/render_frame_impl.h" 23 #include "content/renderer/render_frame_impl.h"
23 #include "content/renderer/render_widget.h" 24 #include "content/renderer/render_widget.h"
(...skipping 19 matching lines...) Expand all
43 const char kPageGetAppManifest[] = "Page.getAppManifest"; 44 const char kPageGetAppManifest[] = "Page.getAppManifest";
44 45
45 46
46 class WebKitClientMessageLoopImpl 47 class WebKitClientMessageLoopImpl
47 : public WebDevToolsAgentClient::WebKitClientMessageLoop { 48 : public WebDevToolsAgentClient::WebKitClientMessageLoop {
48 public: 49 public:
49 WebKitClientMessageLoopImpl() : message_loop_(base::MessageLoop::current()) {} 50 WebKitClientMessageLoopImpl() : message_loop_(base::MessageLoop::current()) {}
50 ~WebKitClientMessageLoopImpl() override { message_loop_ = NULL; } 51 ~WebKitClientMessageLoopImpl() override { message_loop_ = NULL; }
51 void run() override { 52 void run() override {
52 base::MessageLoop::ScopedNestableTaskAllower allow(message_loop_); 53 base::MessageLoop::ScopedNestableTaskAllower allow(message_loop_);
53 message_loop_->Run(); 54 base::RunLoop().Run();
54 } 55 }
55 void quitNow() override { message_loop_->QuitNow(); } 56 void quitNow() override { message_loop_->QuitNow(); }
56 57
57 private: 58 private:
58 base::MessageLoop* message_loop_; 59 base::MessageLoop* message_loop_;
59 }; 60 };
60 61
61 typedef std::map<int, DevToolsAgent*> IdToAgentMap; 62 typedef std::map<int, DevToolsAgent*> IdToAgentMap;
62 base::LazyInstance<IdToAgentMap>::Leaky 63 base::LazyInstance<IdToAgentMap>::Leaky
63 g_agent_for_routing_id = LAZY_INSTANCE_INITIALIZER; 64 g_agent_for_routing_id = LAZY_INSTANCE_INITIALIZER;
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 result->Set("errors", errors.release()); 324 result->Set("errors", errors.release());
324 response->Set("result", result.release()); 325 response->Set("result", result.release());
325 326
326 std::string json_message; 327 std::string json_message;
327 base::JSONWriter::Write(*response, &json_message); 328 base::JSONWriter::Write(*response, &json_message);
328 SendChunkedProtocolMessage(this, routing_id(), session_id, call_id, 329 SendChunkedProtocolMessage(this, routing_id(), session_id, call_id,
329 json_message, std::string()); 330 json_message, std::string());
330 } 331 }
331 332
332 } // namespace content 333 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698