zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert 6107 "Adds a modified copy of talk/base to webrtc/base. I..."

Browse Source 
This breaks Chromium FYI builds and prevent roll of webrtc/libjingle to Chrome.

http://chromegw.corp.google.com/i/chromium.webrtc.fyi/builders/Win%20Builder/builds/457


> Adds a modified copy of talk/base to webrtc/base. It is the first step in migrating talk/base to webrtc/base.
> 
> BUG=N/A
> R=andrew@webrtc.org, wu@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/12199004

TBR=henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14479004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6116 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
perkj@webrtc.org
2014-05-13 08:15:48 +00:00
parent 3a5825909d
commit e9a604accd
386 changed files with 6 additions and 84973 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
webrtc/base/linuxwindowpicker.h
View File

@ -1,51 +0,0 @@
/*
* Copyright 2010 The WebRTC Project Authors. All rights reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef WEBRTC_BASE_LINUXWINDOWPICKER_H_
#define WEBRTC_BASE_LINUXWINDOWPICKER_H_
#include "webrtc/base/basictypes.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/windowpicker.h"
// Avoid include <X11/Xlib.h>.
struct _XDisplay;
typedef unsigned long Window;
namespace rtc {
class XWindowEnumerator;
class LinuxWindowPicker : public WindowPicker {
public:
LinuxWindowPicker();
~LinuxWindowPicker();
static bool IsDesktopElement(_XDisplay* display, Window window);
virtual bool Init();
virtual bool IsVisible(const WindowId& id);
virtual bool MoveToFront(const WindowId& id);
virtual bool GetWindowList(WindowDescriptionList* descriptions);
virtual bool GetDesktopList(DesktopDescriptionList* descriptions);
virtual bool GetDesktopDimensions(const DesktopId& id, int* width,
int* height);
uint8* GetWindowIcon(const WindowId& id, int* width, int* height);
uint8* GetWindowThumbnail(const WindowId& id, int width, int height);
int GetNumDesktops();
uint8* GetDesktopThumbnail(const DesktopId& id, int width, int height);
private:
scoped_ptr<XWindowEnumerator> enumerator_;
};
} // namespace rtc
#endif // WEBRTC_BASE_LINUXWINDOWPICKER_H_