summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-18 01:52:07 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-18 01:52:07 +0000
commit14acb5764b5a947975d7b7905a1ecdde2b91abad (patch)
tree1a07d993d2578d6bb54aa27637dca53dcfb7344b
parent2b33dcd05b6156e45a22d0055330c7c24d315712 (diff)
downloadchromium_src-14acb5764b5a947975d7b7905a1ecdde2b91abad.zip
chromium_src-14acb5764b5a947975d7b7905a1ecdde2b91abad.tar.gz
chromium_src-14acb5764b5a947975d7b7905a1ecdde2b91abad.tar.bz2
It's OS_MACOSX, not OS_MAC.
Introduced here: http://codereview.chromium.org/9570012/ I codesearched for "\bOS_MAC\b" to make sure this is the only place where we get this wrong. BUG=90078 TEST=Add "-all_load" to linker command lines. __Z24ShowOneClickSigninDialogP7ProfileRKSsS2_S2_ doesn't show up in the list of undefined symbols. TBR=pkasting Review URL: http://codereview.chromium.org/9716017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127389 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/media_stream_infobar_delegate.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/media_stream_infobar_delegate.cc b/chrome/browser/ui/media_stream_infobar_delegate.cc
index 56ab12f..d732a0b 100644
--- a/chrome/browser/ui/media_stream_infobar_delegate.cc
+++ b/chrome/browser/ui/media_stream_infobar_delegate.cc
@@ -110,14 +110,14 @@ void MediaStreamInfoBarDelegate::AddDeviceWithId(
// MediaStreamInfoBarDelegate::CreateInfoBar is implemented in platform-specific
// files.
-#if defined(OS_MAC)
+#if defined(OS_MACOSX)
// TODO(macourteau): This section is temporary, until the InfoBar is implemented
// on MacOS, to make sure everything compiles and links.
InfoBar* MediaStreamInfoBarDelegate::CreateInfoBar(InfoBarTabHelper* owner) {
DCHECK(owner);
return NULL;
}
-#endif // OS_MAC
+#endif // OS_MACOSX
void MediaStreamInfoBarDelegate::InfoBarDismissed() {
// Deny the request if the infobar was closed with the 'x' button, since