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

Unified Diff: mash/example/common/mus_views_init.h

Issue 2131493002: ShellConnection -> ServiceContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@st
Patch Set: . Created 4 years, 5 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 | « content/public/common/mojo_shell_connection.h ('k') | mash/example/window_type_launcher/main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/example/common/mus_views_init.h
diff --git a/mash/example/common/mus_views_init.h b/mash/example/common/mus_views_init.h
index f92e703b606e11509db458dcceb205001dafb647..a37d7b86febf8bcaa99f807c70ea324688b6d4fe 100644
--- a/mash/example/common/mus_views_init.h
+++ b/mash/example/common/mus_views_init.h
@@ -13,8 +13,8 @@
#include "ui/views/mus/aura_init.h"
#include "ui/views/views_delegate.h"
-namespace mojo {
-class ShellConnection;
+namespace shell {
+class ServiceContext;
}
namespace views {
@@ -25,7 +25,7 @@ class AuraInit;
class MUSViewsInit : public views::ViewsDelegate,
public ui::WindowTreeClientDelegate {
public:
- explicit MUSViewsInit(shell::ShellConnection* app);
+ explicit MUSViewsInit(shell::ServiceContext* app);
~MUSViewsInit() override;
private:
@@ -45,7 +45,7 @@ class MUSViewsInit : public views::ViewsDelegate,
HICON GetSmallWindowIcon() const override;
#endif
- shell::ShellConnection* app_;
+ shell::ServiceContext* app_;
std::unique_ptr<views::AuraInit> aura_init_;
ui::mojom::WindowManagerPtr window_manager_;
« no previous file with comments | « content/public/common/mojo_shell_connection.h ('k') | mash/example/window_type_launcher/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698