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

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

Issue 17099003: Use primary display as hangout/gtalk broadcast window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
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/root_window_host_x11.h" 5 #include "ui/aura/root_window_host_x11.h"
6 6
7 #include <strings.h> 7 #include <strings.h>
8 #include <X11/cursorfont.h> 8 #include <X11/cursorfont.h>
9 #include <X11/extensions/Xfixes.h> 9 #include <X11/extensions/Xfixes.h>
10 #include <X11/extensions/XInput2.h> 10 #include <X11/extensions/XInput2.h>
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 xwindow_, 411 xwindow_,
412 atom_cache_.GetAtom("_NET_WM_PID"), 412 atom_cache_.GetAtom("_NET_WM_PID"),
413 XA_CARDINAL, 413 XA_CARDINAL,
414 32, 414 32,
415 PropModeReplace, 415 PropModeReplace,
416 reinterpret_cast<unsigned char*>(&pid), 1); 416 reinterpret_cast<unsigned char*>(&pid), 1);
417 417
418 // crbug.com/120229 - set the window title so gtalk can find the primary root 418 // crbug.com/120229 - set the window title so gtalk can find the primary root
419 // window to broadcast. 419 // window to broadcast.
420 // TODO(jhorwich) Remove this once Chrome supports window-based broadcasting. 420 // TODO(jhorwich) Remove this once Chrome supports window-based broadcasting.
421 /*
421 static int root_window_number = 0; 422 static int root_window_number = 0;
422 std::string name = base::StringPrintf("aura_root_%d", root_window_number++); 423 std::string name = base::StringPrintf("aura_root_%d", root_window_number++);
423 XStoreName(xdisplay_, xwindow_, name.c_str()); 424 XStoreName(xdisplay_, xwindow_, name.c_str());
425 */
Josh Horwich 2013/06/14 22:44:03 Why not just remove this code and the above commen
oshima 2013/06/14 23:10:01 Doh, I thought I did, but looks like I didn't save
424 XRRSelectInput(xdisplay_, x_root_window_, 426 XRRSelectInput(xdisplay_, x_root_window_,
425 RRScreenChangeNotifyMask | RROutputChangeNotifyMask); 427 RRScreenChangeNotifyMask | RROutputChangeNotifyMask);
426 Env::GetInstance()->AddObserver(this); 428 Env::GetInstance()->AddObserver(this);
427 } 429 }
428 430
429 RootWindowHostX11::~RootWindowHostX11() { 431 RootWindowHostX11::~RootWindowHostX11() {
430 Env::GetInstance()->RemoveObserver(this); 432 Env::GetInstance()->RemoveObserver(this);
431 base::MessagePumpAuraX11::Current()->RemoveDispatcherForRootWindow(this); 433 base::MessagePumpAuraX11::Current()->RemoveDispatcherForRootWindow(this);
432 base::MessagePumpAuraX11::Current()->RemoveDispatcherForWindow(xwindow_); 434 base::MessagePumpAuraX11::Current()->RemoveDispatcherForWindow(xwindow_);
433 435
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after
1105 } 1107 }
1106 1108
1107 namespace test { 1109 namespace test {
1108 1110
1109 void SetUseOverrideRedirectWindowByDefault(bool override_redirect) { 1111 void SetUseOverrideRedirectWindowByDefault(bool override_redirect) {
1110 default_override_redirect = override_redirect; 1112 default_override_redirect = override_redirect;
1111 } 1113 }
1112 1114
1113 } // namespace test 1115 } // namespace test
1114 } // namespace aura 1116 } // namespace aura
OLDNEW
« ash/display/display_controller_unittest.cc ('K') | « ash/display/display_controller_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698