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

Side by Side Diff: ash/host/ash_window_tree_host_x11.cc

Issue 1641003002: [exp] ash: Ash in Mus. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot-merge Created 4 years, 10 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
« no previous file with comments | « ash/host/ash_window_tree_host_ozone.cc ('k') | ash/host/transformer_helper.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ash/host/ash_window_tree_host_x11.h" 5 #include "ash/host/ash_window_tree_host_x11.h"
6 6
7 #include <X11/Xatom.h> 7 #include <X11/Xatom.h>
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 #include <X11/extensions/XInput2.h> 9 #include <X11/extensions/XInput2.h>
10 #include <X11/extensions/Xfixes.h> 10 #include <X11/extensions/Xfixes.h>
(...skipping 17 matching lines...) Expand all
28 #include "ui/events/event_utils.h" 28 #include "ui/events/event_utils.h"
29 #include "ui/events/null_event_targeter.h" 29 #include "ui/events/null_event_targeter.h"
30 #include "ui/events/platform/platform_event_source.h" 30 #include "ui/events/platform/platform_event_source.h"
31 #include "ui/gfx/geometry/rect.h" 31 #include "ui/gfx/geometry/rect.h"
32 #include "ui/gfx/screen.h" 32 #include "ui/gfx/screen.h"
33 33
34 namespace ash { 34 namespace ash {
35 35
36 AshWindowTreeHostX11::AshWindowTreeHostX11(const gfx::Rect& initial_bounds) 36 AshWindowTreeHostX11::AshWindowTreeHostX11(const gfx::Rect& initial_bounds)
37 : WindowTreeHostX11(initial_bounds), transformer_helper_(this) { 37 : WindowTreeHostX11(initial_bounds), transformer_helper_(this) {
38 CHECK(false);
38 transformer_helper_.Init(); 39 transformer_helper_.Init();
39 aura::Env::GetInstance()->AddObserver(this); 40 aura::Env::GetInstance()->AddObserver(this);
40 } 41 }
41 42
42 AshWindowTreeHostX11::~AshWindowTreeHostX11() { 43 AshWindowTreeHostX11::~AshWindowTreeHostX11() {
43 aura::Env::GetInstance()->RemoveObserver(this); 44 aura::Env::GetInstance()->RemoveObserver(this);
44 UnConfineCursor(); 45 UnConfineCursor();
45 } 46 }
46 47
47 void AshWindowTreeHostX11::ToggleFullScreen() { NOTIMPLEMENTED(); } 48 void AshWindowTreeHostX11::ToggleFullScreen() { NOTIMPLEMENTED(); }
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 XA_INTEGER, 284 XA_INTEGER,
284 8, 285 8,
285 PropModeReplace, 286 PropModeReplace,
286 &value, 287 &value,
287 1); 288 1);
288 } 289 }
289 } 290 }
290 } 291 }
291 #endif 292 #endif
292 293
293 AshWindowTreeHost* AshWindowTreeHost::Create(
294 const AshWindowTreeHostInitParams& init_params) {
295 if (init_params.offscreen)
296 return new AshWindowTreeHostUnified(init_params.initial_bounds);
297 return new AshWindowTreeHostX11(init_params.initial_bounds);
298 }
299
300 } // namespace ash 294 } // namespace ash
OLDNEW
« no previous file with comments | « ash/host/ash_window_tree_host_ozone.cc ('k') | ash/host/transformer_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698