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

Unified Diff: shell/android/background_application_loader.h

Issue 788243007: Moves BackgroundShellApplicationLoader to shell/android (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: merge 2 trunk Created 6 years 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 | « shell/BUILD.gn ('k') | shell/android/background_application_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/android/background_application_loader.h
diff --git a/mojo/application_manager/background_shell_application_loader.h b/shell/android/background_application_loader.h
similarity index 72%
rename from mojo/application_manager/background_shell_application_loader.h
rename to shell/android/background_application_loader.h
index a1d8ef34fc219eaf04c87a12b097244a5a57caf4..5321d97df3f769835946cfed0a4315edd57ce33b 100644
--- a/mojo/application_manager/background_shell_application_loader.h
+++ b/shell/android/background_application_loader.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_APPLICATION_MANAGER_BACKGROUND_SHELL_APPLICATION_LOADER_H_
-#define MOJO_APPLICATION_MANAGER_BACKGROUND_SHELL_APPLICATION_LOADER_H_
+#ifndef SHELL_ANDROID_BACKGROUND_APPLICATION_LOADER_H_
+#define SHELL_ANDROID_BACKGROUND_APPLICATION_LOADER_H_
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
@@ -14,17 +14,14 @@
namespace mojo {
-// TODO(tim): Eventually this should be Android-only to support services
-// that we need to bundle with the shell (such as NetworkService). Perhaps
-// we should move it to shell/ as well.
-class MOJO_APPLICATION_MANAGER_EXPORT BackgroundShellApplicationLoader
+class MOJO_APPLICATION_MANAGER_EXPORT BackgroundApplicationLoader
: public ApplicationLoader,
public base::DelegateSimpleThread::Delegate {
public:
- BackgroundShellApplicationLoader(scoped_ptr<ApplicationLoader> real_loader,
- const std::string& thread_name,
- base::MessageLoop::Type message_loop_type);
- ~BackgroundShellApplicationLoader() override;
+ BackgroundApplicationLoader(scoped_ptr<ApplicationLoader> real_loader,
+ const std::string& thread_name,
+ base::MessageLoop::Type message_loop_type);
+ ~BackgroundApplicationLoader() override;
// ApplicationLoader overrides:
void Load(ApplicationManager* manager,
@@ -65,9 +62,9 @@ class MOJO_APPLICATION_MANAGER_EXPORT BackgroundShellApplicationLoader
scoped_ptr<base::DelegateSimpleThread> thread_;
- DISALLOW_COPY_AND_ASSIGN(BackgroundShellApplicationLoader);
+ DISALLOW_COPY_AND_ASSIGN(BackgroundApplicationLoader);
};
} // namespace mojo
-#endif // MOJO_APPLICATION_MANAGER_BACKGROUND_SHELL_APPLICATION_LOADER_H_
+#endif // SHELL_ANDROID_BACKGROUND_APPLICATION_LOADER_H_
« no previous file with comments | « shell/BUILD.gn ('k') | shell/android/background_application_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698