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

Unified Diff: chrome/browser/dom_distiller/profile_utils.cc

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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: chrome/browser/dom_distiller/profile_utils.cc
diff --git a/chrome/browser/dom_distiller/profile_utils.cc b/chrome/browser/dom_distiller/profile_utils.cc
index 9ae53ef88f2f194658b2aff43b20694a44c0fd51..909e4c32945aa047fa84dff21d942be093f34e6c 100644
--- a/chrome/browser/dom_distiller/profile_utils.cc
+++ b/chrome/browser/dom_distiller/profile_utils.cc
@@ -16,7 +16,7 @@
#include "components/dom_distiller/core/dom_distiller_switches.h"
#include "components/dom_distiller/core/url_constants.h"
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
#include "chrome/browser/android/dom_distiller/external_feedback_reporter_android.h"
#endif // defined(OS_ANDROID)
@@ -32,10 +32,10 @@ void RegisterDomDistillerViewerSource(Profile* profile) {
profile, dom_distiller_service_factory);
scoped_ptr<dom_distiller::ExternalFeedbackReporter> reporter;
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
reporter.reset(
- new dom_distiller::android::ExternalFeedbackReporterAndroid());
-#endif // defined(OS_ANDROID)
+ new dom_distiller::android::q());
+#endif // defined(OS_ANDROID) && !defined(USE_AURA)
// Set the JavaScript world ID.
if (!dom_distiller::DistillerJavaScriptWorldIdIsSet()) {

Powered by Google App Engine
This is Rietveld 408576698