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

Unified Diff: mash/example/views_examples/views_examples_application_delegate.cc

Issue 1725353003: Eliminate mojo::Shell client lib class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@15connector
Patch Set: . Created 4 years, 10 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
Index: mash/example/views_examples/views_examples_application_delegate.cc
diff --git a/mash/example/views_examples/views_examples_application_delegate.cc b/mash/example/views_examples/views_examples_application_delegate.cc
index 9be2175ec505e0ccf9f447c5f9f5b18fc6689a1a..1c4c20016f4abb1c37643f3b7bf276d77117b2c7 100644
--- a/mash/example/views_examples/views_examples_application_delegate.cc
+++ b/mash/example/views_examples/views_examples_application_delegate.cc
@@ -5,7 +5,7 @@
#include "mash/example/views_examples/views_examples_application_delegate.h"
#include "mojo/shell/public/cpp/connection.h"
-#include "mojo/shell/public/cpp/shell.h"
+#include "mojo/shell/public/cpp/connector.h"
#include "ui/views/examples/example_base.h"
#include "ui/views/examples/examples_window.h"
#include "ui/views/mus/aura_init.h"
@@ -16,14 +16,14 @@ ViewsExamplesApplicationDelegate::ViewsExamplesApplicationDelegate() {}
ViewsExamplesApplicationDelegate::~ViewsExamplesApplicationDelegate() {
}
-void ViewsExamplesApplicationDelegate::Initialize(mojo::Shell* shell,
+void ViewsExamplesApplicationDelegate::Initialize(mojo::Connector* connector,
const std::string& url,
uint32_t id,
uint32_t user_id) {
- tracing_.Initialize(shell, url);
- aura_init_.reset(new views::AuraInit(shell, "views_mus_resources.pak"));
+ tracing_.Initialize(connector, url);
+ aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
- views::WindowManagerConnection::Create(shell);
+ views::WindowManagerConnection::Create(connector);
views::examples::ShowExamplesWindow(views::examples::DO_NOTHING_ON_CLOSE,
nullptr, nullptr);

Powered by Google App Engine
This is Rietveld 408576698