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

Unified Diff: shell/android/intent_receiver_manager_impl.cc

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/intent_receiver_manager_impl.cc
diff --git a/shell/android/intent_receiver_manager_impl.cc b/shell/android/intent_receiver_manager_impl.cc
index 2a8919181e2a32686497ca47a82db98a50aff380..2012806235a55a7dbc47a3121c0b858b7448a565 100644
--- a/shell/android/intent_receiver_manager_impl.cc
+++ b/shell/android/intent_receiver_manager_impl.cc
@@ -8,19 +8,18 @@
#include "jni/IntentReceiverRegistry_jni.h"
#include "mojo/public/cpp/bindings/error_handler.h"
-namespace mojo {
namespace shell {
namespace {
-mojo::Array<uint8> BufferToArray(JNIEnv* env, jobject buffer) {
+mojo::Array<uint8_t> BufferToArray(JNIEnv* env, jobject buffer) {
const size_t size = env->GetDirectBufferCapacity(buffer);
- Array<uint8> result(size);
+ mojo::Array<uint8_t> result(size);
memcpy(&result.front(), env->GetDirectBufferAddress(buffer), size);
return result.Pass();
}
-class IntentDispatcher : public ErrorHandler {
+class IntentDispatcher : public mojo::ErrorHandler {
public:
IntentDispatcher(intent_receiver::IntentReceiverPtr intent_receiver)
: intent_receiver_(intent_receiver.Pass()) {
@@ -38,7 +37,7 @@ class IntentDispatcher : public ErrorHandler {
}
private:
- // Overriden from ErrorHandler
+ // Overriden from mojo::ErrorHandler
void OnConnectionError() {
intent_receiver_.set_error_handler(nullptr);
delete this;
@@ -50,7 +49,7 @@ class IntentDispatcher : public ErrorHandler {
} // namespace
void IntentReceiverManagerImpl::Bind(
- InterfaceRequest<intent_receiver::IntentReceiverManager> request) {
+ mojo::InterfaceRequest<intent_receiver::IntentReceiverManager> request) {
bindings_.AddBinding(this, request.Pass());
}
@@ -79,4 +78,3 @@ void OnIntentReceived(JNIEnv* env,
}
} // namespace shell
-} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698