diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 18:36:00 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 18:36:00 +0000 |
| commit | 005bab086c8d301c29e99db5903b00bb18cbdaaf (patch) | |
| tree | 5e64a9a62a571276d1f040d9ac49a1a185473c28 /remoting | |
| parent | e378878b3eb3ad69affcdb3f8e36accbd1ea4c4c (diff) | |
| download | chromium_src-005bab086c8d301c29e99db5903b00bb18cbdaaf.zip chromium_src-005bab086c8d301c29e99db5903b00bb18cbdaaf.tar.gz chromium_src-005bab086c8d301c29e99db5903b00bb18cbdaaf.tar.bz2 | |
Move json_value_serializer from content/common to base.
R=darin@chromium.org
BUG=92044
TEST=
Review URL: http://codereview.chromium.org/8165009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104527 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/plugin/policy_hack/nat_policy_linux.cc | 2 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/remoting/host/plugin/policy_hack/nat_policy_linux.cc b/remoting/host/plugin/policy_hack/nat_policy_linux.cc index e7c177d..e4a2bf0 100644 --- a/remoting/host/plugin/policy_hack/nat_policy_linux.cc +++ b/remoting/host/plugin/policy_hack/nat_policy_linux.cc @@ -19,13 +19,13 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/files/file_path_watcher.h" +#include "base/json/json_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop_proxy.h" #include "base/synchronization/waitable_event.h" #include "base/time.h" #include "base/values.h" -#include "content/common/json_value_serializer.h" namespace remoting { namespace policy_hack { diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index bc8087a7..a71932c 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -202,11 +202,6 @@ '../third_party/npapi/npapi.gyp:npapi', ], 'sources': [ - # Hack for NPAPI policy support. REMOVE ASAP. - # Bug: http://crbug.com/92576 - '../content/common/json_value_serializer.cc', - '../content/common/json_value_serializer.h', - 'host/plugin/host_log_handler.cc', 'host/plugin/host_log_handler.h', 'host/plugin/host_plugin.cc', |