| Index: webkit/glue/devtools/devtools_rpc.h
|
| ===================================================================
|
| --- webkit/glue/devtools/devtools_rpc.h (revision 30177)
|
| +++ webkit/glue/devtools/devtools_rpc.h (working copy)
|
| @@ -52,9 +52,7 @@
|
|
|
| #include "PlatformString.h"
|
|
|
| -// TODO(darin): Remove these dependencies on Chromium base/.
|
| -#include "base/basictypes.h"
|
| -#include "base/compiler_specific.h"
|
| +#include <wtf/Noncopyable.h>
|
|
|
| namespace WebCore {
|
| class String;
|
| @@ -74,7 +72,7 @@
|
| struct RpcTypeTrait<bool> {
|
| typedef bool ApiType;
|
| static bool Parse(const WebCore::String& t) {
|
| - ALLOW_UNUSED bool success;
|
| + bool success;
|
| int i = t.toIntStrict(&success);
|
| ASSERT(success);
|
| return i;
|
| @@ -88,7 +86,7 @@
|
| struct RpcTypeTrait<int> {
|
| typedef int ApiType;
|
| static int Parse(const WebCore::String& t) {
|
| - ALLOW_UNUSED bool success;
|
| + bool success;
|
| int i = t.toIntStrict(&success);
|
| ASSERT(success);
|
| return i;
|
| @@ -265,9 +263,9 @@
|
|
|
| ///////////////////////////////////////////////////////
|
| // RPC base class
|
| -class DevToolsRpc {
|
| +class DevToolsRpc : public Noncopyable {
|
| public:
|
| - class Delegate {
|
| + class Delegate : public Noncopyable {
|
| public:
|
| Delegate() {}
|
| virtual ~Delegate() {}
|
| @@ -276,8 +274,6 @@
|
| const WebCore::String& p1 = "",
|
| const WebCore::String& p2 = "",
|
| const WebCore::String& p3 = "") = 0;
|
| - private:
|
| - DISALLOW_COPY_AND_ASSIGN(Delegate);
|
| };
|
|
|
| explicit DevToolsRpc(Delegate* delegate)
|
| @@ -286,8 +282,6 @@
|
|
|
| protected:
|
| Delegate* delegate_;
|
| - private:
|
| - DISALLOW_COPY_AND_ASSIGN(DevToolsRpc);
|
| };
|
|
|
| #endif // WEBKIT_GLUE_DEVTOOLS_DEVTOOLS_RPC_H_
|
|
|