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

Unified Diff: ui/aura/env.cc

Issue 277713002: ui/compositor: move the browser compositor thread to the ContextFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, fix includes Created 6 years, 7 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
« no previous file with comments | « mojo/aura/context_factory_mojo.cc ('k') | ui/compositor/compositor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/env.cc
diff --git a/ui/aura/env.cc b/ui/aura/env.cc
index bd074f91452da1d072b17bebc56a089e4140d65e..6fa86da46270299fc470ab318286c42ae32ddba6 100644
--- a/ui/aura/env.cc
+++ b/ui/aura/env.cc
@@ -6,7 +6,6 @@
#include "ui/aura/env_observer.h"
#include "ui/aura/input_state_lookup.h"
-#include "ui/compositor/compositor.h"
#include "ui/events/event_target_iterator.h"
#include "ui/events/platform/platform_event_source.h"
@@ -26,8 +25,6 @@ Env::Env()
Env::~Env() {
FOR_EACH_OBSERVER(EnvObserver, observers_, OnWillDestroyEnv());
-
- ui::Compositor::Terminate();
}
//static
@@ -68,8 +65,6 @@ bool Env::IsMouseButtonDown() const {
// Env, private:
void Env::Init(bool create_event_source) {
- ui::Compositor::Initialize();
-
if (create_event_source && !ui::PlatformEventSource::GetInstance())
event_source_ = ui::PlatformEventSource::CreateDefault();
}
« no previous file with comments | « mojo/aura/context_factory_mojo.cc ('k') | ui/compositor/compositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698