| Index: mash/quick_launch/quick_launch_application.h
|
| diff --git a/mash/quick_launch/quick_launch_application.h b/mash/quick_launch/quick_launch_application.h
|
| index 130a1ddda3931185cd34ffc4a0863ae87a431749..303e5206a5b38602dd3f5d2113d2233cb6f6e196 100644
|
| --- a/mash/quick_launch/quick_launch_application.h
|
| +++ b/mash/quick_launch/quick_launch_application.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "mojo/services/catalog/public/interfaces/catalog.mojom.h"
|
| #include "mojo/services/tracing/public/cpp/tracing_impl.h"
|
| #include "mojo/shell/public/cpp/shell_client.h"
|
|
|
| @@ -27,7 +28,6 @@ class QuickLaunchApplication : public mojo::ShellClient {
|
| void Initialize(mojo::Connector* connector,
|
| const mojo::Identity& identity,
|
| uint32_t id) override;
|
| - bool AcceptConnection(mojo::Connection* connection) override;
|
|
|
| mojo::TracingImpl tracing_;
|
| scoped_ptr<views::AuraInit> aura_init_;
|
|
|