Make definition order match declaration order.

chrome/browser/infobars/infobar_tab_helper.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/infobars/infobar_tab_helper.h"
 
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_delegate.h"
 #include "chrome/browser/infobars/insecure_content_infobar_delegate.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 117 matching lines @@
 }
 
 InfoBarDelegate* InfoBarTabHelper::GetInfoBarDelegateAt(size_t index) {
   return infobars_[index];
 }
 
 content::WebContents* InfoBarTabHelper::GetWebContents() {
   return content::WebContentsObserver::web_contents();
 }
 
-void InfoBarTabHelper::RemoveInfoBarInternal(InfoBarDelegate* delegate,
-                                             bool animate) {
-  if (!infobars_enabled_) {
-    DCHECK(infobars_.empty());
-    return;
-  }
-
-  InfoBars::iterator i(std::find(infobars_.begin(), infobars_.end(), delegate));
-  DCHECK(i != infobars_.end());
-
-  delegate->clear_owner();
-  // Remove the delegate before notifying, so that if any observers call back to
-  // AddInfoBar() or similar, we don't dupe-check against this delegate.
-  infobars_.erase(i);
-  // Remove ourselves as an observer if we are tracking no more InfoBars.
-  if (infobars_.empty()) {
-    registrar_.Remove(
-        this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-        content::Source<NavigationController>(
-            &web_contents()->GetController()));
-  }
-
-  InfoBarRemovedDetails removed_details(delegate, animate);
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
-      content::Source<InfoBarService>(this),
-      content::Details<InfoBarRemovedDetails>(&removed_details));
-}
-
-void InfoBarTabHelper::RemoveAllInfoBars(bool animate) {
-  while (!infobars_.empty())
-    RemoveInfoBarInternal(GetInfoBarDelegateAt(GetInfoBarCount() - 1), animate);
-}
-
-void InfoBarTabHelper::OnDidBlockDisplayingInsecureContent() {
-  InsecureContentInfoBarDelegate::Create(
-      this, InsecureContentInfoBarDelegate::DISPLAY);
-}
-
-void InfoBarTabHelper::OnDidBlockRunningInsecureContent() {
-  InsecureContentInfoBarDelegate::Create(this,
-                                         InsecureContentInfoBarDelegate::RUN);
-}
-
 void InfoBarTabHelper::RenderViewGone(base::TerminationStatus status) {
   RemoveAllInfoBars(true);
 }
 
 bool InfoBarTabHelper::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(InfoBarTabHelper, message)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DidBlockDisplayingInsecureContent,
                         OnDidBlockDisplayingInsecureContent)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DidBlockRunningInsecureContent,
@@ skipping 28 matching lines @@
   DCHECK_EQ(type, content::NOTIFICATION_WEB_CONTENTS_DESTROYED);
   // The WebContents is going away; be aggressively paranoid and delete
   // ourselves lest other parts of the system attempt to add infobars or use
   // us otherwise during the destruction.
   DCHECK_EQ(web_contents(), content::Source<WebContents>(source).ptr());
   web_contents()->RemoveUserData(UserDataKey());
   // That was the equivalent of "delete this". This object is now destroyed;
   // returning from this function is the only safe thing to do.
   return;
 }
+void InfoBarTabHelper::RemoveInfoBarInternal(InfoBarDelegate* delegate,
+                                             bool animate) {
+  if (!infobars_enabled_) {
+    DCHECK(infobars_.empty());
+    return;
+  }
+
+  InfoBars::iterator i(std::find(infobars_.begin(), infobars_.end(), delegate));
+  DCHECK(i != infobars_.end());
+
+  delegate->clear_owner();
+  // Remove the delegate before notifying, so that if any observers call back to
+  // AddInfoBar() or similar, we don't dupe-check against this delegate.
+  infobars_.erase(i);
+  // Remove ourselves as an observer if we are tracking no more InfoBars.
+  if (infobars_.empty()) {
+    registrar_.Remove(
+        this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
+        content::Source<NavigationController>(
+            &web_contents()->GetController()));
+  }
+
+  InfoBarRemovedDetails removed_details(delegate, animate);
+  content::NotificationService::current()->Notify(
+      chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
+      content::Source<InfoBarService>(this),
+      content::Details<InfoBarRemovedDetails>(&removed_details));
+}
+
+void InfoBarTabHelper::RemoveAllInfoBars(bool animate) {
+  while (!infobars_.empty())
+    RemoveInfoBarInternal(GetInfoBarDelegateAt(GetInfoBarCount() - 1), animate);
+}
+
+void InfoBarTabHelper::OnDidBlockDisplayingInsecureContent() {
+  InsecureContentInfoBarDelegate::Create(
+      this, InsecureContentInfoBarDelegate::DISPLAY);
+}
+
+void InfoBarTabHelper::OnDidBlockRunningInsecureContent() {
+  InsecureContentInfoBarDelegate::Create(this,
+                                         InsecureContentInfoBarDelegate::RUN);
+}