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

Unified Diff: mash/quick_launch/quick_launch.cc

Issue 1675083002: Rename ApplicationDelegate to ShellClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@delegate
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
« no previous file with comments | « mash/example/window_type_launcher/window_type_launcher.cc ('k') | mash/screenlock/screenlock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/quick_launch/quick_launch.cc
diff --git a/mash/quick_launch/quick_launch.cc b/mash/quick_launch/quick_launch.cc
index 369cd7c90134cdcd38d5522ef383d5262c87f3c1..41a18d07c9fe39b76f8ee09801b265387a44afd8 100644
--- a/mash/quick_launch/quick_launch.cc
+++ b/mash/quick_launch/quick_launch.cc
@@ -7,9 +7,9 @@
#include "base/strings/utf_string_conversions.h"
#include "mojo/public/c/system/main.h"
#include "mojo/services/tracing/public/cpp/tracing_impl.h"
-#include "mojo/shell/public/cpp/application_delegate.h"
#include "mojo/shell/public/cpp/application_runner.h"
#include "mojo/shell/public/cpp/shell.h"
+#include "mojo/shell/public/cpp/shell_client.h"
#include "ui/views/background.h"
#include "ui/views/controls/textfield/textfield.h"
#include "ui/views/controls/textfield/textfield_controller.h"
@@ -79,18 +79,18 @@ class QuickLaunchUI : public views::WidgetDelegateView,
mojo::Shell* shell_;
views::Textfield* prompt_;
- std::vector<scoped_ptr<mojo::ApplicationConnection>> connections_;
+ std::vector<scoped_ptr<mojo::Connection>> connections_;
DISALLOW_COPY_AND_ASSIGN(QuickLaunchUI);
};
-class QuickLaunchApplicationDelegate : public mojo::ApplicationDelegate {
+class QuickLaunchApplicationDelegate : public mojo::ShellClient {
public:
QuickLaunchApplicationDelegate() {}
~QuickLaunchApplicationDelegate() override {}
private:
- // mojo::ApplicationDelegate:
+ // mojo::ShellClient:
void Initialize(mojo::Shell* shell, const std::string& url,
uint32_t id) override {
tracing_.Initialize(shell, url);
« no previous file with comments | « mash/example/window_type_launcher/window_type_launcher.cc ('k') | mash/screenlock/screenlock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698