Implement Linux Media Stream Infobar

chrome/browser/ui/media_stream_infobar_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 #include <functional>
 
 #include "base/logging.h"
 #include "chrome/browser/ui/media_stream_infobar_delegate.h"
+#include "chrome/browser/ui/gtk/infobars/media_stream_infobar_gtk.h"

[macourteau, 2012/03/01 14:06:23]

Please don't include GTK headers here (see comments below).

 #include "content/public/common/media_stream_request.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 // A predicate that checks if a StreamDeviceInfo object has the same ID as the
 // device ID specified at construction.
 class DeviceIdEquals {
  public:
@@ skipping 83 matching lines @@
     content::MediaStreamDevices::const_iterator it = std::find_if(
         device_it->second.begin(), device_it->second.end(), DeviceIdEquals(id));
     if (it != device_it->second.end())
       devices->push_back(*it);
   }
 }
 
 // MediaStreamInfoBarDelegate::CreateInfoBar is implemented in platform-specific
 // files.
 
 #if !defined(TOOLKIT_VIEWS)

[macourteau, 2012/03/01 14:06:23]

Please change this to:
#if !defined(TOOLKIT_VIEWS) && !defined(OS_LINUX)
and edit the #endif comment accordingly.

Then, implement the CreateInfoBar method in your platform-specific file (which
would be media_stream_infobar_gtk.cc in this case). You can see how I've done it
for the Views implementation here:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/ui/views/infob...

 // TODO(macourteau): This section is temporary, until the InfoBar is implemented
 // on other platforms, to make sure everything compiles and links.
 InfoBar* MediaStreamInfoBarDelegate::CreateInfoBar(InfoBarTabHelper* owner) {
   DCHECK(owner);
+#if defined(OS_LINUX)

[macourteau, 2012/03/01 14:06:23]

Please remove this chunk of code (see my comment above).

+  MediaStreamInfoBarGtk* infobar_gtk = new MediaStreamInfoBarGtk(owner, this);
+  return infobar_gtk;
+#endif  // OS_LINUX
   return NULL;
 }
 #endif  // !TOOLKIT_VIEWS
 
 void MediaStreamInfoBarDelegate::InfoBarDismissed() {
   // Deny the request if the infobar was closed with the 'x' button, since
   // we don't want WebRTC to be waiting for an answer that will never come.
   Deny();
 }
 
 gfx::Image* MediaStreamInfoBarDelegate::GetIcon() const {
   return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(has_video_ ?
       IDR_INFOBAR_MEDIA_STREAM_CAMERA : IDR_INFOBAR_MEDIA_STREAM_MIC);
 }
 
 InfoBarDelegate::Type MediaStreamInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
 MediaStreamInfoBarDelegate*
     MediaStreamInfoBarDelegate::AsMediaStreamInfobarDelegate() {
   return this;
 }