Cleanup: de-inline a bunch of classes, rename and move "PluginInstaller" to "...

chrome/browser/ui/browser.cc

 // Copyright (c) 2011 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 <shellapi.h>
 #include <windows.h>
 #endif  // OS_WIN
@@ skipping 3266 matching lines @@
       break;
     }
 
     case NotificationType::EXTENSION_LOADED: {
       window()->GetLocationBar()->UpdatePageActions();
 
       // If any "This extension has crashed" InfoBarDelegates are around for
       // this extension, it means that it has been reloaded in another window
       // so just remove the remaining CrashedExtensionInfoBarDelegate objects.
       const Extension* extension = Details<const Extension>(details).ptr();
-      CrashedExtensionInfoBarDelegate* delegate = NULL;
       TabStripModel* model = tab_handler_->GetTabStripModel();
       for (int m = 0; m < model->count(); ++m) {
         TabContents* tab_contents = model->GetTabContentsAt(m)->tab_contents();
-        for (int i = 0; i < tab_contents->infobar_delegate_count();) {
-          delegate = tab_contents->GetInfoBarDelegateAt(i)->
-              AsCrashedExtensionInfoBarDelegate();
-          if (delegate && delegate->extension_id() == extension->id()) {
+        for (int i = 0; i < tab_contents->infobar_delegate_count(); ) {
+          CrashedExtensionInfoBarDelegate* delegate = tab_contents->
+              GetInfoBarDelegateAt(i)->AsCrashedExtensionInfoBarDelegate();
+          if (delegate && delegate->extension_id() == extension->id())
             tab_contents->RemoveInfoBar(delegate);
-            continue;
-          }
-          // Only increment |i| if we didn't remove an entry.
-          ++i;
+          else
+            ++i;
         }
       }
       break;
     }
 
     case NotificationType::BROWSER_THEME_CHANGED:
       window()->UserChangedTheme();
       break;
 
     case NotificationType::EXTENSION_READY_FOR_INSTALL: {
@@ skipping 952 matching lines @@
     // The page transition below is only for the purpose of inserting the tab.
     browser->AddTab(view_source_contents, PageTransition::LINK);
   }
 
   if (profile_->HasSessionService()) {
     SessionService* session_service = profile_->GetSessionService();
     if (session_service)
       session_service->TabRestored(&view_source_contents->controller(), false);
   }
 }