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

Side by Side Diff: mojo/runner/android/android_handler.h

Issue 1142323003: Remove duplicate application cpp files in mojo/application. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 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 | « mojo/runner/BUILD.gn ('k') | mojo/runner/shell_apptest.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef MOJO_RUNNER_ANDROID_ANDROID_HANDLER_H_ 5 #ifndef MOJO_RUNNER_ANDROID_ANDROID_HANDLER_H_
6 #define MOJO_RUNNER_ANDROID_ANDROID_HANDLER_H_ 6 #define MOJO_RUNNER_ANDROID_ANDROID_HANDLER_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "mojo/application/content_handler_factory.h"
11 #include "mojo/application/public/cpp/application_delegate.h" 10 #include "mojo/application/public/cpp/application_delegate.h"
11 #include "mojo/application/public/cpp/content_handler_factory.h"
12 #include "mojo/application/public/cpp/interface_factory_impl.h" 12 #include "mojo/application/public/cpp/interface_factory_impl.h"
13 #include "mojo/application/public/interfaces/content_handler.mojom.h" 13 #include "mojo/application/public/interfaces/content_handler.mojom.h"
14 14
15 namespace base { 15 namespace base {
16 class FilePath; 16 class FilePath;
17 } 17 }
18 18
19 namespace mojo { 19 namespace mojo {
20 namespace runner { 20 namespace runner {
21 21
(...skipping 15 matching lines...) Expand all
37 ContentHandlerFactory content_handler_factory_; 37 ContentHandlerFactory content_handler_factory_;
38 MOJO_DISALLOW_COPY_AND_ASSIGN(AndroidHandler); 38 MOJO_DISALLOW_COPY_AND_ASSIGN(AndroidHandler);
39 }; 39 };
40 40
41 bool RegisterAndroidHandlerJni(JNIEnv* env); 41 bool RegisterAndroidHandlerJni(JNIEnv* env);
42 42
43 } // namespace runner 43 } // namespace runner
44 } // namespace mojo 44 } // namespace mojo
45 45
46 #endif // MOJO_RUNNER_ANDROID_ANDROID_HANDLER_H_ 46 #endif // MOJO_RUNNER_ANDROID_ANDROID_HANDLER_H_
OLDNEW
« no previous file with comments | « mojo/runner/BUILD.gn ('k') | mojo/runner/shell_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698