summaryrefslogtreecommitdiffstats
path: root/chromeos/chromeos.gyp
diff options
context:
space:
mode:
authornkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-05 14:15:23 +0000
committernkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-05 14:15:23 +0000
commit164675f24132f078ed2e9e2b71d4780ba2385a06 (patch)
tree47fe0b5ec0936dbc8f8d06f6f2fe7d5b0e71e88d /chromeos/chromeos.gyp
parentdfc48e4ce465db7e44e7cb7a4d2628958e1787a0 (diff)
downloadchromium_src-164675f24132f078ed2e9e2b71d4780ba2385a06.zip
chromium_src-164675f24132f078ed2e9e2b71d4780ba2385a06.tar.gz
chromium_src-164675f24132f078ed2e9e2b71d4780ba2385a06.tar.bz2
Revert 154905 - Add is_fullscreen to video updates
Breaks cros_x86, cros_amd64 buildbots: http://build.chromium.org/p/chromium.chromiumos/builders/ChromiumOS%20%28x86%29/builds/8115 This adds a boolean to the video update message sent to powerd that indicates whether or not the video playing window is fullscreen'd. This is information used in powerd for controlling when to enable/disable keyboard backlights. Specifically if video is playing and fullscreen we assume that the user is doing something like watching a movie so will disable backlight. An additional change that I have made is to convert the message being sent from an int64 to a protobuffer that contains a int64 and a boolean. Currently, since the receiver of this message does not live in the same repo it means that every time one wants to change the message format there is a small window where bad builds can be generated or one has to land two changes to the other repo, one to add handling of the new message format and then a second one to remove the old format. Converting to a protobuffer means that for common cases this issues are removed. This CL depends on CLs for power_manager (https://gerrit.chromium.org/gerrit/32092/), one for system_api (https://gerrit.chromium.org/gerrit/31916), and a DEPS roll(http://codereview.chromium.org/10915032/). There will be future CLs for power_manager that will use this information and test this code. BUG=chrome-os-partner:9203 TEST=Run updated unittests. Confirm there is no messages in the cros logs about this method being mishandled. Review URL: https://chromiumcodereview.appspot.com/10905026 TBR=rharrison@chromium.org Review URL: https://chromiumcodereview.appspot.com/10915089 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154952 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/chromeos.gyp')
-rw-r--r--chromeos/chromeos.gyp15
1 files changed, 0 insertions, 15 deletions
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index 2d5c692..762adfd 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -18,7 +18,6 @@
'../third_party/libxml/libxml.gyp:libxml',
'power_state_control_proto',
'power_supply_properties_proto',
- 'video_activity_update_proto',
],
'defines': [
'CHROMEOS_IMPLEMENTATION',
@@ -291,19 +290,5 @@
},
'includes': ['../build/protoc.gypi'],
},
- {
- # Protobuf compiler / generator for the VideoActivityUpdate protocol
- # buffer.
- 'target_name': 'video_activity_update_proto',
- 'type': 'static_library',
- 'sources': [
- '../third_party/cros_system_api/dbus/video_activity_update.proto',
- ],
- 'variables': {
- 'proto_in_dir': '../third_party/cros_system_api/dbus/',
- 'proto_out_dir': 'chromeos/dbus',
- },
- 'includes': ['../build/protoc.gypi'],
- },
],
}