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

Side by Side Diff: components/mus/android_loader.cc

Issue 1351013002: Revert of Mandoline UI Process: Update namespaces and file names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 | « components/mus/android_loader.h ('k') | components/mus/client_connection.h » ('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 "components/mus/android_loader.h" 5 #include "components/mus/android_loader.h"
6 6
7 #include "components/mus/mus_app.h" 7 #include "components/mus/view_manager_app.h"
8 #include "mojo/application/public/cpp/application_impl.h" 8 #include "mojo/application/public/cpp/application_impl.h"
9 9
10 namespace mus { 10 namespace view_manager {
11 11
12 AndroidLoader::AndroidLoader() {} 12 AndroidLoader::AndroidLoader() {}
13 AndroidLoader::~AndroidLoader() {} 13 AndroidLoader::~AndroidLoader() {}
14 14
15 void AndroidLoader::Load( 15 void AndroidLoader::Load(
16 const GURL& url, 16 const GURL& url,
17 mojo::InterfaceRequest<mojo::Application> application_request) { 17 mojo::InterfaceRequest<mojo::Application> application_request) {
18 DCHECK(application_request.is_pending()); 18 DCHECK(application_request.is_pending());
19 app_.reset(new mojo::ApplicationImpl(new MandolineUIServicesApp, 19 app_.reset(new mojo::ApplicationImpl(new ViewManagerApp,
20 application_request.Pass())); 20 application_request.Pass()));
21 } 21 }
22 22
23 } // namespace mus 23 } // namespace view_manager
OLDNEW
« no previous file with comments | « components/mus/android_loader.h ('k') | components/mus/client_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698