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

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

Issue 11829040: Fix the content_browsertests everywhere maybe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 7 years, 11 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/env.h ('k') | ui/aura/test/test_stacking_client.cc » ('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 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "ui/aura/env_observer.h" 8 #include "ui/aura/env_observer.h"
9 #include "ui/aura/root_window_host.h" 9 #include "ui/aura/root_window_host.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
11 #include "ui/compositor/compositor.h" 11 #include "ui/compositor/compositor.h"
12 #include "ui/compositor/compositor_switches.h" 12 #include "ui/compositor/compositor_switches.h"
13 13
14 #if defined(USE_X11) 14 #if defined(USE_X11)
15 #include "base/message_pump_aurax11.h" 15 #include "base/message_pump_aurax11.h"
16 #endif 16 #endif
17 17
18 namespace aura { 18 namespace aura {
19 19
20 // static 20 // static
21 Env* Env::instance_ = NULL; 21 Env* Env::instance_ = NULL;
22 22
23 //////////////////////////////////////////////////////////////////////////////// 23 ////////////////////////////////////////////////////////////////////////////////
24 // Env, public: 24 // Env, public:
25 25
26 Env::Env() 26 Env::Env()
27 : mouse_button_flags_(0), 27 : mouse_button_flags_(0),
28 is_touch_down_(false), 28 is_touch_down_(false),
29 render_white_bg_(true), 29 render_white_bg_(true) {
30 stacking_client_(NULL) {
31 } 30 }
32 31
33 Env::~Env() { 32 Env::~Env() {
34 #if defined(USE_X11) 33 #if defined(USE_X11)
35 base::MessagePumpAuraX11::Current()->RemoveObserver( 34 base::MessagePumpAuraX11::Current()->RemoveObserver(
36 &device_list_updater_aurax11_); 35 &device_list_updater_aurax11_);
37 #endif 36 #endif
38 37
39 ui::Compositor::Terminate(); 38 ui::Compositor::Terminate();
40 } 39 }
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 103
105 bool Env::CanAcceptEvent(const ui::Event& event) { 104 bool Env::CanAcceptEvent(const ui::Event& event) {
106 return true; 105 return true;
107 } 106 }
108 107
109 ui::EventTarget* Env::GetParentTarget() { 108 ui::EventTarget* Env::GetParentTarget() {
110 return NULL; 109 return NULL;
111 } 110 }
112 111
113 } // namespace aura 112 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/env.h ('k') | ui/aura/test/test_stacking_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698