remoting/host/plugin/host_script_object.cc - Issue 344773002: Revert 278198 "Remove NPAPI plugin from chromoting webapp."

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 344773002: Revert 278198 "Remove NPAPI plugin from chromoting webapp." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2058/src/

Patch Set: Created 6 years, 6 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:

« no previous file with comments | « remoting/host/plugin/host_script_object.h ('k') | remoting/host/win/version.rc.jinja2 » ('j') | no next file with comments »

OLD	NEW
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/strings/string_util.h"	10 #include "base/strings/string_util.h"

(...skipping 1123 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1134 }	1134 }

1135	1135

1136 void HostNPScriptObject::SetException(const std::string& exception_string) {	1136 void HostNPScriptObject::SetException(const std::string& exception_string) {

1137 DCHECK(plugin_task_runner_->BelongsToCurrentThread());	1137 DCHECK(plugin_task_runner_->BelongsToCurrentThread());

1138	1138

1139 g_npnetscape_funcs->setexception(parent_, exception_string.c_str());	1139 g_npnetscape_funcs->setexception(parent_, exception_string.c_str());

1140 HOST_LOG << exception_string;	1140 HOST_LOG << exception_string;

1141 }	1141 }

1142	1142

1143 } // namespace remoting	1143 } // namespace remoting

OLD	NEW