diff options
Diffstat (limited to 'mojo/shell/public')
| -rw-r--r-- | mojo/shell/public/cpp/application_runner.h | 2 | ||||
| -rw-r--r-- | mojo/shell/public/cpp/application_test_base.h | 4 | ||||
| -rw-r--r-- | mojo/shell/public/cpp/lib/connection_impl.h | 2 | ||||
| -rw-r--r-- | mojo/shell/public/cpp/lib/interface_factory_binder.h | 2 | ||||
| -rw-r--r-- | mojo/shell/public/cpp/shell_client.h | 2 | ||||
| -rw-r--r-- | mojo/shell/public/cpp/shell_connection.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/mojo/shell/public/cpp/application_runner.h b/mojo/shell/public/cpp/application_runner.h index c9b2baa..192d532 100644 --- a/mojo/shell/public/cpp/application_runner.h +++ b/mojo/shell/public/cpp/application_runner.h @@ -55,7 +55,7 @@ class ApplicationRunner { // Whether Run() has been called. bool has_run_; - MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationRunner); + DISALLOW_COPY_AND_ASSIGN(ApplicationRunner); }; } // namespace mojo diff --git a/mojo/shell/public/cpp/application_test_base.h b/mojo/shell/public/cpp/application_test_base.h index 764770a..91160df 100644 --- a/mojo/shell/public/cpp/application_test_base.h +++ b/mojo/shell/public/cpp/application_test_base.h @@ -49,7 +49,7 @@ class TestHelper { uint32_t instance_id_; uint32_t userid_; - MOJO_DISALLOW_COPY_AND_ASSIGN(TestHelper); + DISALLOW_COPY_AND_ASSIGN(TestHelper); }; // A GTEST base class for application testing executed in mojo_shell. @@ -89,7 +89,7 @@ class ApplicationTestBase : public testing::Test { private: scoped_ptr<TestHelper> test_helper_; - MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationTestBase); + DISALLOW_COPY_AND_ASSIGN(ApplicationTestBase); }; } // namespace test diff --git a/mojo/shell/public/cpp/lib/connection_impl.h b/mojo/shell/public/cpp/lib/connection_impl.h index 0e761c0..74140ff 100644 --- a/mojo/shell/public/cpp/lib/connection_impl.h +++ b/mojo/shell/public/cpp/lib/connection_impl.h @@ -71,7 +71,7 @@ class ConnectionImpl : public Connection { base::WeakPtrFactory<ConnectionImpl> weak_factory_; - MOJO_DISALLOW_COPY_AND_ASSIGN(ConnectionImpl); + DISALLOW_COPY_AND_ASSIGN(ConnectionImpl); }; } // namespace internal diff --git a/mojo/shell/public/cpp/lib/interface_factory_binder.h b/mojo/shell/public/cpp/lib/interface_factory_binder.h index 39b98c7..e4f6815 100644 --- a/mojo/shell/public/cpp/lib/interface_factory_binder.h +++ b/mojo/shell/public/cpp/lib/interface_factory_binder.h @@ -30,7 +30,7 @@ class InterfaceFactoryBinder : public InterfaceBinder { private: InterfaceFactory<Interface>* factory_; - MOJO_DISALLOW_COPY_AND_ASSIGN(InterfaceFactoryBinder); + DISALLOW_COPY_AND_ASSIGN(InterfaceFactoryBinder); }; } // namespace internal diff --git a/mojo/shell/public/cpp/shell_client.h b/mojo/shell/public/cpp/shell_client.h index a95f8cf..2eb9079 100644 --- a/mojo/shell/public/cpp/shell_client.h +++ b/mojo/shell/public/cpp/shell_client.h @@ -49,7 +49,7 @@ class ShellClient { virtual bool ShellConnectionLost(); private: - MOJO_DISALLOW_COPY_AND_ASSIGN(ShellClient); + DISALLOW_COPY_AND_ASSIGN(ShellClient); }; } // namespace mojo diff --git a/mojo/shell/public/cpp/shell_connection.h b/mojo/shell/public/cpp/shell_connection.h index 868f89d..07dc39d 100644 --- a/mojo/shell/public/cpp/shell_connection.h +++ b/mojo/shell/public/cpp/shell_connection.h @@ -81,7 +81,7 @@ class ShellConnection : public shell::mojom::ShellClient { scoped_ptr<Connector> connector_; base::WeakPtrFactory<ShellConnection> weak_factory_; - MOJO_DISALLOW_COPY_AND_ASSIGN(ShellConnection); + DISALLOW_COPY_AND_ASSIGN(ShellConnection); }; } // namespace mojo |