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

Side by Side Diff: ui/aura/env.cc

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix DEPS Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/aura/demo/demo_main.cc ('k') | ui/aura/root_window.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/aura/env.h" 5 #include "ui/aura/env.h"
6 #include "ui/aura/env_observer.h" 6 #include "ui/aura/env_observer.h"
7 #include "ui/aura/monitor_manager.h" 7 #include "ui/aura/monitor_manager.h"
8 #include "ui/aura/root_window_host.h" 8 #include "ui/aura/root_window_host.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/gfx/compositor/compositor.h" 10 #include "ui/compositor/compositor.h"
11 11
12 #if defined(USE_X11) 12 #if defined(USE_X11)
13 #include "ui/aura/monitor_change_observer_x11.h" 13 #include "ui/aura/monitor_change_observer_x11.h"
14 #endif 14 #endif
15 15
16 namespace aura { 16 namespace aura {
17 17
18 // static 18 // static
19 Env* Env::instance_ = NULL; 19 Env* Env::instance_ = NULL;
20 20
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 monitor_change_observer_.reset(new internal::MonitorChangeObserverX11); 78 monitor_change_observer_.reset(new internal::MonitorChangeObserverX11);
79 #endif 79 #endif
80 ui::Compositor::Initialize(false); 80 ui::Compositor::Initialize(false);
81 } 81 }
82 82
83 void Env::NotifyWindowInitialized(Window* window) { 83 void Env::NotifyWindowInitialized(Window* window) {
84 FOR_EACH_OBSERVER(EnvObserver, observers_, OnWindowInitialized(window)); 84 FOR_EACH_OBSERVER(EnvObserver, observers_, OnWindowInitialized(window));
85 } 85 }
86 86
87 } // namespace aura 87 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/demo/demo_main.cc ('k') | ui/aura/root_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698