summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-27 22:32:21 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-27 22:32:21 +0000
commita1f8c1673d5a7873769b66356c0d2f2308213dda (patch)
treef4e871590fa4f851db3d480d5bfe9cc9f21fe467 /media
parentff19af783cc8f2bb6adb7adee5cb6a23f4e0115f (diff)
downloadchromium_src-a1f8c1673d5a7873769b66356c0d2f2308213dda.zip
chromium_src-a1f8c1673d5a7873769b66356c0d2f2308213dda.tar.gz
chromium_src-a1f8c1673d5a7873769b66356c0d2f2308213dda.tar.bz2
Cleanup: avoid foo ? true : false, part 1.
Review URL: https://chromiumcodereview.appspot.com/10939010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159137 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/audio/cross_process_notification_unittest.cc2
-rw-r--r--media/tools/player_wtl/mainfrm.h2
-rw-r--r--media/video/capture/win/video_capture_device_win.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/media/audio/cross_process_notification_unittest.cc b/media/audio/cross_process_notification_unittest.cc
index a0392c2..2726cf8 100644
--- a/media/audio/cross_process_notification_unittest.cc
+++ b/media/audio/cross_process_notification_unittest.cc
@@ -133,7 +133,7 @@ struct FlagArray {
FlagArray() : flags_() {}
bool is_set(size_t index) const {
- return (flags_[index >> 5] & (1 << (index & 31))) ? true : false;
+ return (flags_[index >> 5] & (1 << (index & 31)));
}
void set(size_t index) {
diff --git a/media/tools/player_wtl/mainfrm.h b/media/tools/player_wtl/mainfrm.h
index 2705807..54a1ec3 100644
--- a/media/tools/player_wtl/mainfrm.h
+++ b/media/tools/player_wtl/mainfrm.h
@@ -63,7 +63,7 @@ class CMainFrame
virtual BOOL OnIdle() {
BOOL bEnable = !m_view.bmp_.IsNull();
- BOOL bMovieOpen = media::Movie::GetInstance()->IsOpen() ? true : false;
+ BOOL bMovieOpen = media::Movie::GetInstance()->IsOpen();
float current_position = media::Movie::GetInstance()->GetPosition();
float duration = media::Movie::GetInstance()->GetDuration();
diff --git a/media/video/capture/win/video_capture_device_win.cc b/media/video/capture/win/video_capture_device_win.cc
index 05d5b43..5a587b5 100644
--- a/media/video/capture/win/video_capture_device_win.cc
+++ b/media/video/capture/win/video_capture_device_win.cc
@@ -87,7 +87,7 @@ bool PinMatchesCategory(IPin* pin, REFGUID category) {
hr = ks_property->Get(AMPROPSETID_Pin, AMPROPERTY_PIN_CATEGORY, NULL, 0,
&pin_category, sizeof(pin_category), &return_value);
if (SUCCEEDED(hr) && (return_value == sizeof(pin_category))) {
- found = (pin_category == category) ? true : false;
+ found = (pin_category == category);
}
}
return found;