OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "android_webview/browser/aw_devtools_delegate.h" | 5 #include "android_webview/browser/aw_devtools_delegate.h" |
6 | 6 |
7 #include "android_webview/browser/in_process_view_renderer.h" | 7 #include "android_webview/browser/in_process_view_renderer.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/json/json_writer.h" | 9 #include "base/json/json_writer.h" |
10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
231 description.SetBoolean("empty", screen_rect.size().IsEmpty()); | 231 description.SetBoolean("empty", screen_rect.size().IsEmpty()); |
232 if (!screen_rect.size().IsEmpty()) { | 232 if (!screen_rect.size().IsEmpty()) { |
233 description.SetInteger("width", screen_rect.width()); | 233 description.SetInteger("width", screen_rect.width()); |
234 description.SetInteger("height", screen_rect.height()); | 234 description.SetInteger("height", screen_rect.height()); |
235 } | 235 } |
236 std::string json; | 236 std::string json; |
237 base::JSONWriter::Write(&description, &json); | 237 base::JSONWriter::Write(&description, &json); |
238 return json; | 238 return json; |
239 } | 239 } |
240 | 240 |
241 scoped_refptr<net::StreamListenSocket> | 241 scoped_ptr<net::StreamListenSocket> |
242 AwDevToolsDelegate::CreateSocketForTethering( | 242 AwDevToolsDelegate::CreateSocketForTethering( |
243 net::StreamListenSocket::Delegate* delegate, | 243 net::StreamListenSocket::Delegate* delegate, |
244 std::string* name) { | 244 std::string* name) { |
245 return NULL; | 245 return scoped_ptr<net::StreamListenSocket>(); |
246 } | 246 } |
247 | 247 |
248 } // namespace android_webview | 248 } // namespace android_webview |
OLD | NEW |