Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(368)

Unified Diff: ash/mus/window_manager_application.h

Issue 2569953002: Removes example code that isn't correctly wired up (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/window_manager.cc ('k') | ash/mus/window_manager_application.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager_application.h
diff --git a/ash/mus/window_manager_application.h b/ash/mus/window_manager_application.h
index 54a2bfb7ffb4c4e4d95553e37970fc3ec36d001f..5086dedbbabfe67d741ec60b4e670a364a169c86 100644
--- a/ash/mus/window_manager_application.h
+++ b/ash/mus/window_manager_application.h
@@ -13,7 +13,6 @@
#include "ash/public/interfaces/wallpaper.mojom.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "mash/session/public/interfaces/session.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "services/service_manager/public/cpp/service.h"
#include "services/tracing/public/cpp/provider.h"
@@ -49,17 +48,13 @@ class NetworkConnectDelegateMus;
class WindowManager;
// Hosts the window manager and the ash system user interface for mash.
-class WindowManagerApplication
- : public service_manager::Service,
- public mash::session::mojom::ScreenlockStateListener {
+class WindowManagerApplication : public service_manager::Service {
public:
WindowManagerApplication();
~WindowManagerApplication() override;
WindowManager* window_manager() { return window_manager_.get(); }
- mash::session::mojom::Session* session() { return session_.get(); }
-
private:
friend class WmTestBase;
friend class WmTestHelper;
@@ -77,9 +72,6 @@ class WindowManagerApplication
bool OnConnect(const service_manager::ServiceInfo& remote_info,
service_manager::InterfaceRegistry* registry) override;
- // session::mojom::ScreenlockStateListener:
- void ScreenlockStateChanged(bool locked) override;
-
tracing::Provider tracing_;
std::unique_ptr<views::AuraInit> aura_init_;
@@ -91,11 +83,6 @@ class WindowManagerApplication
// A blocking pool used by the WindowManager's shell; not used in tests.
scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
- mash::session::mojom::SessionPtr session_;
-
- mojo::Binding<mash::session::mojom::ScreenlockStateListener>
- screenlock_state_listener_binding_;
-
#if defined(OS_CHROMEOS)
std::unique_ptr<NetworkConnectDelegateMus> network_connect_delegate_;
std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider>
« no previous file with comments | « ash/mus/window_manager.cc ('k') | ash/mus/window_manager_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698