Rolling back change 22245.

chrome/browser/views/frame/browser_view.cc

Index: chrome/browser/views/frame/browser_view.cc
===================================================================
--- chrome/browser/views/frame/browser_view.cc	(revision 22246)
+++ chrome/browser/views/frame/browser_view.cc	(working copy)
@@ -599,13 +599,9 @@
 }
 
 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();
 }
@@ -1494,12 +1490,10 @@
 
   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();