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

Unified Diff: shell/android/ui_application_loader_android.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 side-by-side diff with in-line comments
Download patch
Index: shell/android/ui_application_loader_android.h
diff --git a/shell/android/ui_application_loader_android.h b/shell/android/ui_application_loader_android.h
index 3e785bb9f699fcdf7f91b8cb0c6548df3358ed75..b3c3e949371802c28bae4401c8efcfa5c7adb914 100644
--- a/shell/android/ui_application_loader_android.h
+++ b/shell/android/ui_application_loader_android.h
@@ -13,7 +13,6 @@ namespace base {
class MessageLoop;
}
-namespace mojo {
namespace shell {
class ApplicationManager;
@@ -28,8 +27,9 @@ class UIApplicationLoader : public ApplicationLoader {
~UIApplicationLoader() override;
// ApplicationLoader overrides:
- void Load(const GURL& url,
- InterfaceRequest<Application> application_request) override;
+ void Load(
+ const GURL& url,
+ mojo::InterfaceRequest<mojo::Application> application_request) override;
private:
class UILoader;
@@ -38,8 +38,9 @@ class UIApplicationLoader : public ApplicationLoader {
// to |background_loader_| to do the actual loading.
// TODO: having this code take a |manager| is fragile (as ApplicationManager
// isn't thread safe).
- void LoadOnUIThread(const GURL& url,
- InterfaceRequest<Application> application_request);
+ void LoadOnUIThread(
+ const GURL& url,
+ mojo::InterfaceRequest<mojo::Application> application_request);
void ShutdownOnUIThread();
scoped_ptr<ApplicationLoader> loader_;
@@ -49,6 +50,5 @@ class UIApplicationLoader : public ApplicationLoader {
};
} // namespace shell
-} // namespace mojo
#endif // SHELL_ANDROID_UI_APPLICATION_LOADER_ANDROID_H_

Powered by Google App Engine
This is Rietveld 408576698