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

Side by Side Diff: shell/android/android_handler.h

Issue 1067173003: Remove mojo:: part of mojo::shell:: nested namespace in //shell. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 8 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
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_SHELL_ANDROID_CONTENT_HANDLER_H_ 5 #ifndef MOJO_SHELL_ANDROID_CONTENT_HANDLER_H_
6 #define MOJO_SHELL_ANDROID_CONTENT_HANDLER_H_ 6 #define MOJO_SHELL_ANDROID_CONTENT_HANDLER_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "mojo/application/content_handler_factory.h" 10 #include "mojo/application/content_handler_factory.h"
11 #include "mojo/public/cpp/application/application_delegate.h" 11 #include "mojo/public/cpp/application/application_delegate.h"
12 #include "mojo/public/cpp/application/interface_factory_impl.h" 12 #include "mojo/public/cpp/application/interface_factory_impl.h"
13 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom. h" 13 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom. h"
14 #include "shell/android/intent_receiver_manager_factory.h" 14 #include "shell/android/intent_receiver_manager_factory.h"
15 15
16 namespace base { 16 namespace base {
17 class FilePath; 17 class FilePath;
18 } 18 }
19 19
20 namespace mojo {
21 namespace shell { 20 namespace shell {
22 21
23 class AndroidHandler : public ApplicationDelegate, 22 class AndroidHandler : public mojo::ApplicationDelegate,
24 public ContentHandlerFactory::Delegate { 23 public mojo::ContentHandlerFactory::Delegate {
25 public: 24 public:
26 AndroidHandler(); 25 AndroidHandler();
27 ~AndroidHandler(); 26 ~AndroidHandler();
28 27
29 private: 28 private:
30 // ApplicationDelegate: 29 // mojo::ApplicationDelegate:
31 void Initialize(ApplicationImpl* app) override; 30 void Initialize(mojo::ApplicationImpl* app) override;
32 bool ConfigureIncomingConnection(ApplicationConnection* connection) override; 31 bool ConfigureIncomingConnection(
32 mojo::ApplicationConnection* connection) override;
33 33
34 // ContentHandlerFactory::Delegate: 34 // mojo::ContentHandlerFactory::Delegate:
35 void RunApplication(InterfaceRequest<Application> application_request, 35 void RunApplication(
36 URLResponsePtr response) override; 36 mojo::InterfaceRequest<mojo::Application> application_request,
37 mojo::URLResponsePtr response) override;
37 38
38 ContentHandlerFactory content_handler_factory_; 39 mojo::ContentHandlerFactory content_handler_factory_;
39 IntentReceiverManagerFactory intent_receiver_manager_factory_; 40 IntentReceiverManagerFactory intent_receiver_manager_factory_;
40 41
41 MOJO_DISALLOW_COPY_AND_ASSIGN(AndroidHandler); 42 MOJO_DISALLOW_COPY_AND_ASSIGN(AndroidHandler);
42 }; 43 };
43 44
44 bool RegisterAndroidHandlerJni(JNIEnv* env); 45 bool RegisterAndroidHandlerJni(JNIEnv* env);
45 46
46 } // namespace shell 47 } // namespace shell
47 } // namespace mojo
48 48
49 #endif // MOJO_SHELL_ANDROID_CONTENT_HANDLER_H_ 49 #endif // MOJO_SHELL_ANDROID_CONTENT_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698