Refactor the content interface for RequestMediaAccessPermission.

chrome/browser/ui/browser.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/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 100 matching lines @@
 #include "chrome/browser/ui/extensions/shell_window.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/browser/ui/fullscreen_controller.h"
 #include "chrome/browser/ui/global_error.h"
 #include "chrome/browser/ui/global_error_service.h"
 #include "chrome/browser/ui/global_error_service_factory.h"
 #include "chrome/browser/ui/hung_plugin_tab_helper.h"
 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
+#include "chrome/browser/ui/media_stream_infobar_delegate.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
 #include "chrome/browser/ui/status_bubble.h"
 #include "chrome/browser/ui/sync/browser_synced_window_delegate.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/dock_info.h"
 #include "chrome/browser/ui/tabs/tab_finder.h"
@@ skipping 3547 matching lines @@
                                  bool last_unlocked_by_target) {
   fullscreen_controller_->RequestToLockMouse(tab,
                                              user_gesture,
                                              last_unlocked_by_target);
 }
 
 void Browser::LostMouseLock() {
   fullscreen_controller_->LostMouseLock();
 }
 
+void Browser::RequestMediaAccessPermission(
+    content::WebContents* web_contents,
+    const content::MediaStreamRequest* request,
+    const content::MediaResponseCallback& callback) {
+  TabContentsWrapper* tab =

[jochen (gone - plz use gerrit), 2012/06/09 07:55:21]

TabContentsWrapper is called TabContents these days

[Evan Stade, 2012/06/12 00:00:46]

Done.

+      TabContentsWrapper::GetCurrentWrapperForContents(web_contents);
+  DCHECK(tab);

[jam, 2012/06/11 05:31:57]

nit: no need for dcheck, if it's null the crash in the next line is just as
useful of a signal to the developer

[Evan Stade, 2012/06/12 00:00:46]

I think of DCHECK as documentation. If we remove it, a future developer will
perhaps conclude that it's an oversight that the NULL tab case isn't handled.

[jam, 2012/06/12 00:29:06]

it seems that if a developer reading this assumes that whoever wrote the code is
competant, it's also documenting that using a pointer means they expect it to
not be null.

taken to the extreme, what happens with this convention is that every single
function starts with DCHECKs for all the pointers. from expereince in a large
project that did this, it didn't improve quality or reduce crashes, just added a
lot of rote coding.

since this isn't in the style guide, I'll leave it up to you after this
information

+
+  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();
+  }
+
+  InfoBarDelegate* infobar = new MediaStreamInfoBarDelegate(infobar_helper,
+                                                            request,
+                                                            callback);
+  if (old_infobar)
+    infobar_helper->ReplaceInfoBar(old_infobar, infobar);
+  else
+    infobar_helper->AddInfoBar(infobar);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, CoreTabHelperDelegate implementation:
 
 void Browser::SwapTabContents(TabContents* old_tab_contents,
                               TabContents* new_tab_contents) {
   int index = tab_strip_model_->GetIndexOfTabContents(old_tab_contents);
   DCHECK_NE(TabStripModel::kNoTab, index);
   tab_strip_model_->ReplaceTabContentsAt(index, new_tab_contents);
 }
 
@@ skipping 1474 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }