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_ |