Rolling back change 22245.

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2006-2009 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/views/frame/browser_view.h"
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
@@ skipping 581 matching lines @@
   contents_split_->set_divider_offset(split_offset);
 
   frame_->GetWindow()->Show();
 }
 
 void BrowserView::SetBounds(const gfx::Rect& bounds) {
   GetWidget()->SetBounds(bounds);
 }
 
 void BrowserView::Close() {
-  // BrowserWindowClosing will usually cause the bubble to remove itself from
-  // the set, so we need to iterate in a way that's safe against deletion.
-  for (BubbleSet::iterator i = browser_bubbles_.begin(); 
-       i != browser_bubbles_.end();) {
-    BubbleSet::iterator bubble = i++;
+  BubbleSet::iterator bubble = browser_bubbles_.begin();
+  for (; bubble != browser_bubbles_.end(); ++bubble)
     (*bubble)->BrowserWindowClosing();
-  }
 
   frame_->GetWindow()->Close();
 }
 
 void BrowserView::Activate() {
   frame_->GetWindow()->Activate();
 }
 
 bool BrowserView::IsActive() const {
   return frame_->GetWindow()->IsActive();
@@ skipping 868 matching lines @@
       views::SingleSplitView::VERTICAL_SPLIT);
   SkColor bg_color = GetWidget()->GetThemeProvider()->
       GetColor(BrowserThemeProvider::COLOR_TOOLBAR);
   contents_split_->set_background(
       views::Background::CreateSolidBackground(bg_color));
   AddChildView(contents_split_);
   set_contents_view(contents_split_);
 
   status_bubble_.reset(new StatusBubbleViews(GetWidget()));
 
-  if (browser_->SupportsWindowFeature(Browser::FEATURE_EXTENSIONSHELF)) {
-    extension_shelf_ = new ExtensionShelf(browser_.get());
-    extension_shelf_->
-        SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_EXTENSIONS));
-    AddChildView(extension_shelf_);
-  }
+  extension_shelf_ = new ExtensionShelf(browser_.get());
+  extension_shelf_->
+      SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_EXTENSIONS));
+  AddChildView(extension_shelf_);
 
 #if defined(OS_WIN)
   InitSystemMenu();
 
   // Create a custom JumpList and add it to an observer of TabRestoreService
   // so we can update the custom JumpList when a tab is added or removed.
   if (JumpList::Enabled()) {
     jumplist_.reset(new JumpList);
     jumplist_->AddObserver(browser_->profile());
   }
@@ skipping 429 matching lines @@
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }
 
 // static
 void BrowserList::AllBrowsersClosed() {
   views::Window::CloseAllSecondaryWindows();
 }