add "always allow" option to the mediastream infobar and allow user to allow/not allow acces to devi

chrome/browser/chrome_content_browser_client.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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 22 matching lines @@
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/extensions/extension_webkit_preferences.h"
 #include "chrome/browser/geolocation/chrome_access_token_store.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/gpu_util.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/media/media_internals.h"
+#include "chrome/browser/media/media_stream_devices_controller.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/pepper_gtalk_message_filter.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/prerender/prerender_message_filter.h"
@@ skipping 1058 matching lines @@
     // Abort, if the tab was closed after the request was made but before we
     // got to this point.
     callback.Run(content::MediaStreamDevices());
     return;
   }
 
   TabContentsWrapper* tab =
       TabContentsWrapper::GetCurrentWrapperForContents(contents);
   DCHECK(tab);
 
-  InfoBarTabHelper* infobar_helper = tab->infobar_tab_helper();
-  InfoBarDelegate* old_infobar = NULL;
-  for (size_t i = 0; i < infobar_helper->infobar_count() && !old_infobar; ++i) {
-    old_infobar =
-        infobar_helper->GetInfoBarDelegateAt(i)->AsMediaStreamInfoBarDelegate();
+  scoped_ptr<MediaStreamDevicesController>
+      controller(new MediaStreamDevicesController(tab->profile(),
+                                                  request,
+                                                  callback));
+  if (!controller->DismissInfoBarAndTakeActionOnSettings()) {
+    InfoBarTabHelper* infobar_helper = tab->infobar_tab_helper();
+    InfoBarDelegate* old_infobar = NULL;
+    size_t i = 0;
+    for (; i < infobar_helper->infobar_count() && !old_infobar; ++i) {
+      old_infobar = infobar_helper->GetInfoBarDelegateAt(i)->
+          AsMediaStreamInfoBarDelegate();
+    }
+
+    // The MediaStreamInfoBarDelegate will take the ownership of the controller;
+    MediaStreamInfoBarDelegate* infobar =
+        new MediaStreamInfoBarDelegate(infobar_helper,
+                                       controller.release());
+    if (old_infobar)
+      infobar_helper->ReplaceInfoBar(old_infobar, infobar);
+    else
+      infobar_helper->AddInfoBar(infobar);
   }
-
-  InfoBarDelegate* infobar = new MediaStreamInfoBarDelegate(infobar_helper,
-                                                            request,
-                                                            callback);
-  if (old_infobar)
-    infobar_helper->ReplaceInfoBar(old_infobar, infobar);
-  else
-    infobar_helper->AddInfoBar(infobar);
 }
 
 content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() {
   return MediaInternals::GetInstance();
 }
 
 void ChromeContentBrowserClient::RequestDesktopNotificationPermission(
     const GURL& source_origin,
     int callback_context,
     int render_process_id,
@@ skipping 462 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome