summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authorwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-17 00:27:43 +0000
committerwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-17 00:27:43 +0000
commitad89f79b5d18b63ed71100ecdd316a6392f24c9d (patch)
tree02d8eefaa9f8ad40e9d9dd1606df24e648df5697 /content/browser
parentebb1b5894a55befe47b40648762491ad0d4c0b9d (diff)
downloadchromium_src-ad89f79b5d18b63ed71100ecdd316a6392f24c9d.zip
chromium_src-ad89f79b5d18b63ed71100ecdd316a6392f24c9d.tar.gz
chromium_src-ad89f79b5d18b63ed71100ecdd316a6392f24c9d.tar.bz2
separate interface function and internal task function
fix comparator in VideoCaptureContollerID BUG=none TEST=try bots Review URL: http://codereview.chromium.org/7187002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/renderer_host/media/video_capture_controller_event_handler.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/renderer_host/media/video_capture_controller_event_handler.cc b/content/browser/renderer_host/media/video_capture_controller_event_handler.cc
index 61ccc4a..e6edc41 100644
--- a/content/browser/renderer_host/media/video_capture_controller_event_handler.cc
+++ b/content/browser/renderer_host/media/video_capture_controller_event_handler.cc
@@ -11,5 +11,5 @@ VideoCaptureControllerID::VideoCaptureControllerID(int32 rid, int did)
bool VideoCaptureControllerID::operator<(
const VideoCaptureControllerID& vc) const {
- return this->routing_id < vc.routing_id && this->device_id < vc.device_id;
+ return this->routing_id < vc.routing_id || this->device_id < vc.device_id;
}