Index: chrome/browser/chrome_browser_main_android.cc |
diff --git a/chrome/browser/chrome_browser_main_android.cc b/chrome/browser/chrome_browser_main_android.cc |
index 4fd6d9d710200af8f35ce61a540c1c81723864ef..7877cff8114ab31a29a4231f5b1b76d0813704c9 100644 |
--- a/chrome/browser/chrome_browser_main_android.cc |
+++ b/chrome/browser/chrome_browser_main_android.cc |
@@ -19,7 +19,6 @@ |
#include "components/crash/content/browser/crash_dump_manager_android.h" |
#include "components/enhanced_bookmarks/persistent_image_store.h" |
#include "components/signin/core/browser/signin_manager.h" |
-#include "content/public/browser/android/compositor.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/common/main_function_params.h" |
#include "media/base/android/media_client_android.h" |
@@ -28,6 +27,10 @@ |
#include "ui/base/resource/resource_bundle_android.h" |
#include "ui/base/ui_base_paths.h" |
+#if !defined(USE_AURA) |
+#include "content/public/browser/android/compositor.h" |
+#endif |
+ |
namespace { |
void DeleteFileTask( |
@@ -100,7 +103,9 @@ void ChromeBrowserMainPartsAndroid::PreEarlyInitialization() { |
net::NetworkChangeNotifier::SetFactory( |
new net::NetworkChangeNotifierFactoryAndroid()); |
+#if !defined(USE_AURA) |
content::Compositor::Initialize(); |
+#endif |
// Chrome on Android does not use default MessageLoop. It has its own |
// Android specific MessageLoop. |