Rolling back change 22245.

chrome/browser/browser.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/browser.h"
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/idle_timer.h"
@@ skipping 254 matching lines @@
 Browser* Browser::CreateForApp(const std::wstring& app_name,
                                Profile* profile, bool is_popup) {
   Browser* browser = new Browser(is_popup? TYPE_APP_POPUP : TYPE_APP, profile);
   browser->app_name_ = app_name;
   browser->CreateBrowserWindow();
   return browser;
 }
 
 void Browser::CreateBrowserWindow() {
   DCHECK(!window_);
-
-  if (SupportsWindowFeature(FEATURE_EXTENSIONSHELF))
-    extension_shelf_model_.reset(new ExtensionShelfModel(this));
-
   window_ = BrowserWindow::CreateBrowserWindow(this);
 
   // Show the First Run information bubble if we've been told to.
   PrefService* local_state = g_browser_process->local_state();
   if (!local_state)
     return;
   if (local_state->IsPrefRegistered(prefs::kShouldShowFirstRunBubble) &&
       local_state->GetBoolean(prefs::kShouldShowFirstRunBubble)) {
     bool show_OEM_bubble = (local_state->
         IsPrefRegistered(prefs::kShouldUseOEMFirstRunBubble) &&
@@ skipping 2506 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserToolbarModel (private):
 
 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }