diff options
| author | bshe <bshe@chromium.org> | 2016-01-05 11:22:00 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-05 19:22:49 +0000 |
| commit | bf61917e9a71121634c8d0f0fe0a8d1a5776d75f (patch) | |
| tree | 7a7a5d84eb1a05e85cac01011b2ba7d920cff9eb | |
| parent | 4a8ccc2cdd48f0df6048540801dd57af8fcbaa8e (diff) | |
| download | chromium_src-bf61917e9a71121634c8d0f0fe0a8d1a5776d75f.zip chromium_src-bf61917e9a71121634c8d0f0fe0a8d1a5776d75f.tar.gz chromium_src-bf61917e9a71121634c8d0f0fe0a8d1a5776d75f.tar.bz2 | |
Revert of Don't use Compositor::Initialize for Aura Android (patchset #2 id:20001 of https://codereview.chromium.org/1481623002/ )
Reason for revert:
We dont need to support Aura Android at current stage. Revert related code.
Original issue's description:
> Don't use Compositor::Initialize for Aura Android
>
> The static function is implemented in compositor_impl_android.cc. But Aura
> Android wont compile the file.
>
> BUG=561669
>
> Committed: https://crrev.com/fda1e7f4c4bb69a52d1be0c18366f53b89f81ce0
> Cr-Commit-Position: refs/heads/master@{#362708}
TBR=sky@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=561669
Review URL: https://codereview.chromium.org/1558273002
Cr-Commit-Position: refs/heads/master@{#367607}
| -rw-r--r-- | chrome/browser/chrome_browser_main_android.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/chrome_browser_main_android.cc b/chrome/browser/chrome_browser_main_android.cc index 7877cff..4fd6d9d 100644 --- a/chrome/browser/chrome_browser_main_android.cc +++ b/chrome/browser/chrome_browser_main_android.cc @@ -19,6 +19,7 @@ #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" @@ -27,10 +28,6 @@ #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( @@ -103,9 +100,7 @@ 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. |