Minor infobar cleanup.

chrome/browser/media/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 "chrome/browser/media/media_stream_infobar_delegate.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ skipping 56 matching lines @@
 }
 
 MediaStreamInfoBarDelegate::MediaStreamInfoBarDelegate(
     scoped_ptr<MediaStreamDevicesController> controller)
     : ConfirmInfoBarDelegate(),
       controller_(controller.Pass()) {
   DCHECK(controller_.get());
   DCHECK(controller_->HasAudio() || controller_->HasVideo());
 }
 
-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.
-  UMA_HISTOGRAM_ENUMERATION("Media.DevicePermissionActions",
-                            kCancel, kPermissionActionsMax);
-  controller_->Deny(false, content::MEDIA_DEVICE_PERMISSION_DISMISSED);
+infobars::InfoBarDelegate::Type
+MediaStreamInfoBarDelegate::GetInfoBarType() const {
+  return PAGE_ACTION_TYPE;
 }
 
 int MediaStreamInfoBarDelegate::GetIconID() const {
   return controller_->HasVideo() ?
       IDR_INFOBAR_MEDIA_STREAM_CAMERA : IDR_INFOBAR_MEDIA_STREAM_MIC;
 }
 
-infobars::InfoBarDelegate::Type MediaStreamInfoBarDelegate::GetInfoBarType()
-    const {
-  return PAGE_ACTION_TYPE;
+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.
+  UMA_HISTOGRAM_ENUMERATION("Media.DevicePermissionActions",
+                            kCancel, kPermissionActionsMax);
+  controller_->Deny(false, content::MEDIA_DEVICE_PERMISSION_DISMISSED);
 }
 
 MediaStreamInfoBarDelegate*
     MediaStreamInfoBarDelegate::AsMediaStreamInfoBarDelegate() {
   return this;
 }
 
 base::string16 MediaStreamInfoBarDelegate::GetMessageText() const {
   int message_id = IDS_MEDIA_CAPTURE_AUDIO_AND_VIDEO;
   if (!controller_->HasAudio())
@@ skipping 38 matching lines @@
     WindowOpenDisposition disposition) {
   InfoBarService::WebContentsFromInfoBar(infobar())->OpenURL(
       content::OpenURLParams(
           GURL(chrome::kMediaAccessLearnMoreUrl),
           content::Referrer(),
           (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
           ui::PAGE_TRANSITION_LINK, false));
 
   return false;  // Do not dismiss the info bar.
 }