Index: components/dom_distiller/core/android/core_jni_registrar.cc |
diff --git a/components/dom_distiller/android/component_jni_registrar.cc b/components/dom_distiller/core/android/core_jni_registrar.cc |
similarity index 67% |
rename from components/dom_distiller/android/component_jni_registrar.cc |
rename to components/dom_distiller/core/android/core_jni_registrar.cc |
index 77c8101887b2107d9b739bd29959afebf33c8efc..742372fa45b00ba90b69d315633984bd0760cb59 100644 |
--- a/components/dom_distiller/android/component_jni_registrar.cc |
+++ b/components/dom_distiller/core/android/core_jni_registrar.cc |
@@ -1,28 +1,29 @@ |
-// Copyright 2014 The Chromium Authors. All rights reserved. |
+// Copyright 2016 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "components/dom_distiller/android/component_jni_registrar.h" |
+#include "components/dom_distiller/core/android/core_jni_registrar.h" |
#include "base/android/jni_android.h" |
#include "base/android/jni_registrar.h" |
#include "base/macros.h" |
-#include "components/dom_distiller/content/browser/distillable_page_utils_android.h" |
#include "components/dom_distiller/core/distilled_page_prefs_android.h" |
#include "components/dom_distiller/core/dom_distiller_service_android.h" |
#include "components/dom_distiller/core/url_utils_android.h" |
namespace dom_distiller { |
+namespace core { |
+ |
namespace android { |
static base::android::RegistrationMethod kDomDistillerRegisteredMethods[] = { |
- {"DistilledPagePrefs", DistilledPagePrefsAndroid::Register}, |
- {"DomDistillerService", DomDistillerServiceAndroid::Register}, |
+ {"DistilledPagePrefs", |
+ dom_distiller::android::DistilledPagePrefsAndroid::Register}, |
+ {"DomDistillerService", |
+ dom_distiller::android::DomDistillerServiceAndroid::Register}, |
{"DomDistillerUrlUtils", |
dom_distiller::url_utils::android::RegisterUrlUtils}, |
- {"DistillablePageUtils", |
- dom_distiller::android::RegisterDistillablePageUtils}, |
}; |
bool RegisterDomDistiller(JNIEnv* env) { |
@@ -34,4 +35,6 @@ bool RegisterDomDistiller(JNIEnv* env) { |
} // namespace android |
+} // namespace core |
+ |
} // namespace dom_distiller |