diff options
| author | ben <ben@chromium.org> | 2016-02-05 16:23:05 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-06 00:24:33 +0000 |
| commit | 48e3499642469f5f468a16c0967f4bcf5e10fe79 (patch) | |
| tree | 523d80c6536ffabd1480def3a98d85e8501d8893 /mash/wm | |
| parent | 6bca21e40d0273798d751b41e0abe9a03928ee3d (diff) | |
| download | chromium_src-48e3499642469f5f468a16c0967f4bcf5e10fe79.zip chromium_src-48e3499642469f5f468a16c0967f4bcf5e10fe79.tar.gz chromium_src-48e3499642469f5f468a16c0967f4bcf5e10fe79.tar.bz2 | |
ConfigureIncomingConnection -> AcceptConnection
Makes this interface begin to resemble Application a bit more closely.
R=rockot@chromium.org
BUG=none
Review URL: https://codereview.chromium.org/1674803002
Cr-Commit-Position: refs/heads/master@{#373963}
Diffstat (limited to 'mash/wm')
| -rw-r--r-- | mash/wm/window_manager_application.cc | 2 | ||||
| -rw-r--r-- | mash/wm/window_manager_application.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mash/wm/window_manager_application.cc b/mash/wm/window_manager_application.cc index 8c514ed..1b26295 100644 --- a/mash/wm/window_manager_application.cc +++ b/mash/wm/window_manager_application.cc @@ -118,7 +118,7 @@ void WindowManagerApplication::Initialize(mojo::ApplicationImpl* app) { RootWindowController::CreateUsingWindowTreeHost(this)); } -bool WindowManagerApplication::ConfigureIncomingConnection( +bool WindowManagerApplication::AcceptConnection( mojo::ApplicationConnection* connection) { connection->AddService<mash::wm::mojom::UserWindowController>(this); connection->AddService<mus::mojom::AcceleratorRegistrar>(this); diff --git a/mash/wm/window_manager_application.h b/mash/wm/window_manager_application.h index ffe0603..19aca05 100644 --- a/mash/wm/window_manager_application.h +++ b/mash/wm/window_manager_application.h @@ -80,7 +80,7 @@ class WindowManagerApplication // ApplicationDelegate: void Initialize(mojo::ApplicationImpl* app) override; - bool ConfigureIncomingConnection( + bool AcceptConnection( mojo::ApplicationConnection* connection) override; // InterfaceFactory<mash::wm::mojom::UserWindowController>: |