diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 00:43:34 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 00:43:34 +0000 |
| commit | 7d692835b4257b2621f969037f52e1dca67d833e (patch) | |
| tree | f4523fd166096b65f44163e81d546d2c2d3d5223 /ui/base/x/x11_util.h | |
| parent | f45df627895d165d4762b4b66cea359de34b577a (diff) | |
| download | chromium_src-7d692835b4257b2621f969037f52e1dca67d833e.zip chromium_src-7d692835b4257b2621f969037f52e1dca67d833e.tar.gz chromium_src-7d692835b4257b2621f969037f52e1dca67d833e.tar.bz2 | |
Revert "aura/chromeos: Avoid suspending while video is playing."
This reverts r118171. There's an issue in the destruction
order of ash::VideoDetector vs. ash::Shell.
BUG=110114
TEST=built it
TBR=apatrick
Review URL: https://chromiumcodereview.appspot.com/9232037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118199 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/x/x11_util.h')
| -rw-r--r-- | ui/base/x/x11_util.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ui/base/x/x11_util.h b/ui/base/x/x11_util.h index 411c941..757b149 100644 --- a/ui/base/x/x11_util.h +++ b/ui/base/x/x11_util.h @@ -124,15 +124,6 @@ UI_EXPORT bool GetAtomArrayProperty(XID window, UI_EXPORT bool GetStringProperty( XID window, const std::string& property_name, std::string* value); -UI_EXPORT bool SetIntProperty(XID window, - const std::string& name, - const std::string& type, - int value); -UI_EXPORT bool SetIntArrayProperty(XID window, - const std::string& name, - const std::string& type, - const std::vector<int>& value); - // Gets the X atom for default display corresponding to atom_name. Atom GetAtom(const char* atom_name); |