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

Side by Side Diff: ash/display/mirror_window_controller.cc

Issue 23880006: gtk: Allow building both the X11 and Gtk message-pumps for gtk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge Created 7 years, 3 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 | « no previous file | ash/shell.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/display/mirror_window_controller.h" 5 #include "ash/display/mirror_window_controller.h"
6 6
7 #if defined(USE_X11) 7 #if defined(USE_X11)
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 9
10 // Xlib.h defines RootWindow. 10 // Xlib.h defines RootWindow.
(...skipping 25 matching lines...) Expand all
36 36
37 namespace ash { 37 namespace ash {
38 namespace internal { 38 namespace internal {
39 namespace { 39 namespace {
40 40
41 #if defined(USE_X11) 41 #if defined(USE_X11)
42 // Mirror window shouldn't handle input events. 42 // Mirror window shouldn't handle input events.
43 void DisableInput(XID window) { 43 void DisableInput(XID window) {
44 long event_mask = ExposureMask | VisibilityChangeMask | 44 long event_mask = ExposureMask | VisibilityChangeMask |
45 StructureNotifyMask | PropertyChangeMask; 45 StructureNotifyMask | PropertyChangeMask;
46 XSelectInput(base::MessagePumpAuraX11::GetDefaultXDisplay(), 46 XSelectInput(base::MessagePumpX11::GetDefaultXDisplay(),
47 window, event_mask); 47 window, event_mask);
48 } 48 }
49 #endif 49 #endif
50 50
51 class NoneCaptureClient : public aura::client::CaptureClient { 51 class NoneCaptureClient : public aura::client::CaptureClient {
52 public: 52 public:
53 NoneCaptureClient() {} 53 NoneCaptureClient() {}
54 virtual ~NoneCaptureClient() {} 54 virtual ~NoneCaptureClient() {}
55 55
56 private: 56 private:
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 Shell::GetScreen()->GetPrimaryDisplay().id()); 335 Shell::GetScreen()->GetPrimaryDisplay().id());
336 DCHECK(display_manager->mirrored_display().is_valid()); 336 DCHECK(display_manager->mirrored_display().is_valid());
337 return scoped_ptr<aura::RootWindowTransformer>( 337 return scoped_ptr<aura::RootWindowTransformer>(
338 internal::CreateRootWindowTransformerForMirroredDisplay( 338 internal::CreateRootWindowTransformerForMirroredDisplay(
339 source_display_info, 339 source_display_info,
340 mirror_display_info)); 340 mirror_display_info));
341 } 341 }
342 342
343 } // namespace internal 343 } // namespace internal
344 } // namespace ash 344 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698