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

Unified Diff: ui/views/mus/window_manager_connection.h

Issue 1899323002: Add mash shelf application id support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address simpler comments. Created 4 years, 8 months 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 | « ui/views/mus/platform_test_helper_mus.cc ('k') | ui/views/mus/window_manager_connection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/window_manager_connection.h
diff --git a/ui/views/mus/window_manager_connection.h b/ui/views/mus/window_manager_connection.h
index 469f7e6848562d8dc630c0643158876742af9831..90fd9f70b021353d702456eee8d01914628536bd 100644
--- a/ui/views/mus/window_manager_connection.h
+++ b/ui/views/mus/window_manager_connection.h
@@ -11,6 +11,7 @@
#include "base/macros.h"
#include "components/mus/public/cpp/window_tree_delegate.h"
+#include "services/shell/public/cpp/identity.h"
#include "ui/views/mus/mus_export.h"
#include "ui/views/mus/screen_mus_delegate.h"
#include "ui/views/widget/widget.h"
@@ -38,7 +39,8 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
: public NON_EXPORTED_BASE(mus::WindowTreeDelegate),
public ScreenMusDelegate {
public:
- static void Create(shell::Connector* connector);
+ static void Create(shell::Connector* connector,
+ const shell::Identity& identity);
static WindowManagerConnection* Get();
static bool Exists();
@@ -56,7 +58,8 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
internal::NativeWidgetDelegate* delegate);
private:
- explicit WindowManagerConnection(shell::Connector* connector);
+ WindowManagerConnection(shell::Connector* connector,
+ const shell::Identity& identity);
~WindowManagerConnection() override;
// mus::WindowTreeDelegate:
@@ -67,6 +70,7 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
void OnWindowManagerFrameValuesChanged() override;
shell::Connector* connector_;
+ shell::Identity identity_;
std::unique_ptr<ScreenMus> screen_;
std::unique_ptr<mus::WindowTreeConnection> window_tree_connection_;
« no previous file with comments | « ui/views/mus/platform_test_helper_mus.cc ('k') | ui/views/mus/window_manager_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698