diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-18 20:59:06 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-18 20:59:06 +0000 |
| commit | 7f8f556408487205d27c3d192e13300418629397 (patch) | |
| tree | 2b2e8ce52f8f9e0ca973cc9a1e5f331e9223c6b2 /remoting/host | |
| parent | 1d0079155dc88b3793e36b01a5888fc58b0ce374 (diff) | |
| download | chromium_src-7f8f556408487205d27c3d192e13300418629397.zip chromium_src-7f8f556408487205d27c3d192e13300418629397.tar.gz chromium_src-7f8f556408487205d27c3d192e13300418629397.tar.bz2 | |
Remove base/scoped_ptr.h
Fix remaining users to use base/memory/scoped_ptr.h.
BUG=
TEST=
Review URL: http://codereview.chromium.org/7930009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101715 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/plugin/policy_hack/nat_policy_linux.cc | 2 | ||||
| -rw-r--r-- | remoting/host/plugin/policy_hack/nat_policy_mac.mm | 2 | ||||
| -rw-r--r-- | remoting/host/plugin/policy_hack/nat_policy_win.cc | 8 |
3 files changed, 6 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 ac1fcd9..e7c177d 100644 --- a/remoting/host/plugin/policy_hack/nat_policy_linux.cc +++ b/remoting/host/plugin/policy_hack/nat_policy_linux.cc @@ -19,9 +19,9 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/files/file_path_watcher.h" +#include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop_proxy.h" -#include "base/scoped_ptr.h" #include "base/synchronization/waitable_event.h" #include "base/time.h" #include "base/values.h" diff --git a/remoting/host/plugin/policy_hack/nat_policy_mac.mm b/remoting/host/plugin/policy_hack/nat_policy_mac.mm index 9fde3f3..6bfd0b6 100644 --- a/remoting/host/plugin/policy_hack/nat_policy_mac.mm +++ b/remoting/host/plugin/policy_hack/nat_policy_mac.mm @@ -8,8 +8,8 @@ #include "base/compiler_specific.h" #include "base/mac/scoped_cftyperef.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop_proxy.h" -#include "base/scoped_ptr.h" #include "base/sys_string_conversions.h" #include "base/values.h" diff --git a/remoting/host/plugin/policy_hack/nat_policy_win.cc b/remoting/host/plugin/policy_hack/nat_policy_win.cc index ac1b789..bd0e0bc 100644 --- a/remoting/host/plugin/policy_hack/nat_policy_win.cc +++ b/remoting/host/plugin/policy_hack/nat_policy_win.cc @@ -15,14 +15,14 @@ #include <userenv.h> #include "base/compiler_specific.h" -#include "base/string16.h" -#include "base/utf_string_conversions.h" -#include "base/win/registry.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop_proxy.h" -#include "base/scoped_ptr.h" +#include "base/string16.h" #include "base/synchronization/waitable_event.h" +#include "base/utf_string_conversions.h" #include "base/values.h" #include "base/win/object_watcher.h" +#include "base/win/registry.h" // userenv.dll is required for RegisterGPNotification(). #pragma comment(lib, "userenv.lib") |