| Index: mash/example/window_type_launcher/window_type_launcher.cc
|
| diff --git a/mash/example/window_type_launcher/window_type_launcher.cc b/mash/example/window_type_launcher/window_type_launcher.cc
|
| index 6f4d5b14910efba936b91236f601357cf0aca087..14ffd164a909d84c4c0d6aa139a3b4e99a2a9257 100644
|
| --- a/mash/example/window_type_launcher/window_type_launcher.cc
|
| +++ b/mash/example/window_type_launcher/window_type_launcher.cc
|
| @@ -8,7 +8,7 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "mash/shell/public/interfaces/shell.mojom.h"
|
| #include "mojo/converters/geometry/geometry_type_converters.h"
|
| -#include "mojo/shell/public/cpp/application_connection.h"
|
| +#include "mojo/shell/public/cpp/connection.h"
|
| #include "mojo/shell/public/cpp/shell.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/aura/window_event_dispatcher.h"
|
| @@ -355,11 +355,6 @@ class WindowTypeLauncherView : public views::WidgetDelegateView,
|
| WindowTypeLauncher::WindowTypeLauncher() {}
|
| WindowTypeLauncher::~WindowTypeLauncher() {}
|
|
|
| -bool WindowTypeLauncher::AcceptConnection(
|
| - mojo::ApplicationConnection* connection) {
|
| - return false;
|
| -}
|
| -
|
| void WindowTypeLauncher::Initialize(mojo::Shell* shell, const std::string& url,
|
| uint32_t id) {
|
| aura_init_.reset(new views::AuraInit(shell, "views_mus_resources.pak"));
|
|
|