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

Unified Diff: content/shell/renderer/test_runner/CppBoundClass.h

Issue 123243002: Replace WebNonCopyable with DISALLOW_COPY_AND_ASSIGN in test runner library (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 6 years, 12 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/shell/renderer/test_runner/MockColorChooser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/renderer/test_runner/CppBoundClass.h
diff --git a/content/shell/renderer/test_runner/CppBoundClass.h b/content/shell/renderer/test_runner/CppBoundClass.h
index 87d0ac145d400bab30375cb0d8ca7b8433cf850a..636a1beb1423398842ed92af95c2aa4b49720999 100644
--- a/content/shell/renderer/test_runner/CppBoundClass.h
+++ b/content/shell/renderer/test_runner/CppBoundClass.h
@@ -50,9 +50,9 @@
#include <map>
#include <vector>
+#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "content/shell/renderer/test_runner/CppVariant.h"
-#include "third_party/WebKit/public/platform/WebNonCopyable.h"
namespace blink {
class WebFrame;
@@ -65,7 +65,7 @@ typedef std::vector<CppVariant> CppArgumentList;
// CppBoundClass lets you map Javascript method calls and property accesses
// directly to C++ method calls and CppVariant* variable access.
-class CppBoundClass : public blink::WebNonCopyable {
+class CppBoundClass {
public:
class PropertyCallback {
public:
@@ -244,6 +244,8 @@ private:
// True if our np_object has been bound to a WebFrame, in which case it must
// be unregistered with V8 when we delete it.
bool m_boundToFrame;
+
+ DISALLOW_COPY_AND_ASSIGN(CppBoundClass);
};
}
« no previous file with comments | « no previous file | content/shell/renderer/test_runner/MockColorChooser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698