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

Side by Side Diff: mash/shell/shell_application_delegate.cc

Issue 1565343003: Move mojo/application/public -> mojo/shell/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fetcher
Patch Set: . Created 4 years, 11 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 unified diff | Download patch
« no previous file with comments | « mash/shell/shell_application_delegate.h ('k') | mash/system_ui/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mash/shell/shell_application_delegate.h" 5 #include "mash/shell/shell_application_delegate.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "mojo/application/public/cpp/application_connection.h" 8 #include "mojo/shell/public/cpp/application_connection.h"
9 #include "mojo/application/public/cpp/application_impl.h" 9 #include "mojo/shell/public/cpp/application_impl.h"
10 10
11 namespace mash { 11 namespace mash {
12 namespace shell { 12 namespace shell {
13 13
14 ShellApplicationDelegate::ShellApplicationDelegate() : app_(nullptr) {} 14 ShellApplicationDelegate::ShellApplicationDelegate() : app_(nullptr) {}
15 15
16 ShellApplicationDelegate::~ShellApplicationDelegate() {} 16 ShellApplicationDelegate::~ShellApplicationDelegate() {}
17 17
18 void ShellApplicationDelegate::Initialize(mojo::ApplicationImpl* app) { 18 void ShellApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {
19 app_ = app; 19 app_ = app;
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 // TODO(beng): This would be the place to insert logic that counted restarts 68 // TODO(beng): This would be the place to insert logic that counted restarts
69 // to avoid infinite crash-restart loops. 69 // to avoid infinite crash-restart loops.
70 scoped_ptr<mojo::ApplicationConnection> connection = 70 scoped_ptr<mojo::ApplicationConnection> connection =
71 app_->ConnectToApplication(url); 71 app_->ConnectToApplication(url);
72 connection->SetRemoteServiceProviderConnectionErrorHandler(restart_callback); 72 connection->SetRemoteServiceProviderConnectionErrorHandler(restart_callback);
73 connections_[url] = std::move(connection); 73 connections_[url] = std::move(connection);
74 } 74 }
75 75
76 } // namespace shell 76 } // namespace shell
77 } // namespace main 77 } // namespace main
OLDNEW
« no previous file with comments | « mash/shell/shell_application_delegate.h ('k') | mash/system_ui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698