diff options
| author | ben <ben@chromium.org> | 2016-02-08 17:43:05 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-09 01:44:42 +0000 |
| commit | d3a4bc09b9692bf6165aa9390d057830466743a5 (patch) | |
| tree | b846d0e4328a781ffb6aad420cfcfcc037627cc6 /mash/example | |
| parent | 03ab577189f899ca7562a8c1328ead855c15051b (diff) | |
| download | chromium_src-d3a4bc09b9692bf6165aa9390d057830466743a5.zip chromium_src-d3a4bc09b9692bf6165aa9390d057830466743a5.tar.gz chromium_src-d3a4bc09b9692bf6165aa9390d057830466743a5.tar.bz2 | |
ApplicationImpl->ShellConnection
mojom::Application->mojom::ShellClient
R=rockot@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1675153002
Cr-Commit-Position: refs/heads/master@{#374259}
Diffstat (limited to 'mash/example')
| -rw-r--r-- | mash/example/common/mus_views_init.h | 6 | ||||
| -rw-r--r-- | mash/example/window_type_launcher/main.cc | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mash/example/common/mus_views_init.h b/mash/example/common/mus_views_init.h index 43da4f4..aff5dc7 100644 --- a/mash/example/common/mus_views_init.h +++ b/mash/example/common/mus_views_init.h @@ -13,7 +13,7 @@ #include "ui/views/views_delegate.h" namespace mojo { -class ApplicationImpl; +class ShellConnection; } namespace views { @@ -24,7 +24,7 @@ class AuraInit; class MUSViewsInit : public views::ViewsDelegate, public mus::WindowTreeDelegate { public: - explicit MUSViewsInit(mojo::ApplicationImpl* app); + explicit MUSViewsInit(mojo::ShellConnection* app); ~MUSViewsInit() override; private: @@ -44,7 +44,7 @@ class MUSViewsInit : public views::ViewsDelegate, HICON GetSmallWindowIcon() const override; #endif - mojo::ApplicationImpl* app_; + mojo::ShellConnection* app_; scoped_ptr<views::AuraInit> aura_init_; mus::mojom::WindowManagerPtr window_manager_; diff --git a/mash/example/window_type_launcher/main.cc b/mash/example/window_type_launcher/main.cc index 53d6257..289b56c 100644 --- a/mash/example/window_type_launcher/main.cc +++ b/mash/example/window_type_launcher/main.cc @@ -15,8 +15,8 @@ #include "build/build_config.h" #include "mash/example/window_type_launcher/window_type_launcher.h" #include "mojo/message_pump/message_pump_mojo.h" -#include "mojo/shell/public/cpp/application_impl.h" -#include "mojo/shell/public/interfaces/application.mojom.h" +#include "mojo/shell/public/cpp/shell_connection.h" +#include "mojo/shell/public/interfaces/shell_client.mojom.h" #include "mojo/shell/runner/child/runner_connection.h" #include "mojo/shell/runner/init.h" #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" @@ -65,13 +65,13 @@ int main(int argc, char** argv) { io_thread.task_runner().get(), mojo::embedder::ScopedPlatformHandle()); - mojo::ApplicationRequest application_request; + mojo::ShellClientRequest request; scoped_ptr<mojo::shell::RunnerConnection> connection( mojo::shell::RunnerConnection::ConnectToRunner( - &application_request, mojo::ScopedMessagePipeHandle())); + &request, mojo::ScopedMessagePipeHandle())); base::MessageLoop loop(mojo::common::MessagePumpMojo::Create()); WindowTypeLauncher delegate; - mojo::ApplicationImpl impl(&delegate, std::move(application_request)); + mojo::ShellConnection impl(&delegate, std::move(request)); loop.Run(); mojo::embedder::ShutdownIPCSupport(); |