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

Side by Side Diff: remoting/host/plugin/host_script_object.cc

Issue 13322003: Update the remaining references to sys_string_conversions.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 "remoting/host/plugin/host_script_object.h" 5 #include "remoting/host/plugin/host_script_object.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "base/message_loop_proxy.h" 11 #include "base/message_loop_proxy.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "base/stringprintf.h" 13 #include "base/stringprintf.h"
14 #include "base/sys_string_conversions.h" 14 #include "base/strings/sys_string_conversions.h"
15 #include "base/threading/platform_thread.h" 15 #include "base/threading/platform_thread.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "base/values.h" 17 #include "base/values.h"
18 #include "net/base/net_util.h" 18 #include "net/base/net_util.h"
19 #include "remoting/base/auth_token_util.h" 19 #include "remoting/base/auth_token_util.h"
20 #include "remoting/base/auto_thread.h" 20 #include "remoting/base/auto_thread.h"
21 #include "remoting/base/rsa_key_pair.h" 21 #include "remoting/base/rsa_key_pair.h"
22 #include "remoting/host/basic_desktop_environment.h" 22 #include "remoting/host/basic_desktop_environment.h"
23 #include "remoting/host/chromoting_host.h" 23 #include "remoting/host/chromoting_host.h"
24 #include "remoting/host/chromoting_host_context.h" 24 #include "remoting/host/chromoting_host_context.h"
(...skipping 1558 matching lines...) Expand 10 before | Expand all | Expand 10 after
1583 } 1583 }
1584 1584
1585 void HostNPScriptObject::SetException(const std::string& exception_string) { 1585 void HostNPScriptObject::SetException(const std::string& exception_string) {
1586 DCHECK(plugin_task_runner_->BelongsToCurrentThread()); 1586 DCHECK(plugin_task_runner_->BelongsToCurrentThread());
1587 1587
1588 g_npnetscape_funcs->setexception(parent_, exception_string.c_str()); 1588 g_npnetscape_funcs->setexception(parent_, exception_string.c_str());
1589 LOG(INFO) << exception_string; 1589 LOG(INFO) << exception_string;
1590 } 1590 }
1591 1591
1592 } // namespace remoting 1592 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698