Rolling back change 22245.

chrome/browser/browser.h

 // 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.
 
 #ifndef CHROME_BROWSER_BROWSER_H_
 #define CHROME_BROWSER_BROWSER_H_
 
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "chrome/browser/command_updater.h"
-#include "chrome/browser/extensions/extension_shelf_model.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/pref_member.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
@@ skipping 100 matching lines @@
     DCHECK(!window_);
     window_ = window;
   }
 #endif
 
   BrowserWindow* window() const { return window_; }
   ToolbarModel* toolbar_model() { return &toolbar_model_; }
   const SessionID& session_id() const { return session_id_; }
   CommandUpdater* command_updater() { return &command_updater_; }
   FindBarController* find_bar() { return find_bar_controller_.get(); }
-  ExtensionShelfModel* extension_shelf_model() { 
-    return extension_shelf_model_.get(); 
-  }
 
   // Setters /////////////////////////////////////////////////////////////////
 
   void set_user_data_dir_profiles(const std::vector<std::wstring>& profiles);
 
   // Browser Creation Helpers /////////////////////////////////////////////////
 
   // Opens a new window with the default blank tab.
   static void OpenEmptyWindow(Profile* profile);
 
@@ skipping 550 matching lines @@
 
   private:
     Browser* browser_;
 
     DISALLOW_COPY_AND_ASSIGN(BrowserToolbarModel);
   };
 
   // The model for the toolbar view.
   BrowserToolbarModel toolbar_model_;
 
-  // The model for the extension shelf.
-  scoped_ptr<ExtensionShelfModel> extension_shelf_model_;
-
   // UI update coalescing and handling ////////////////////////////////////////
 
   // Tracks invalidates to the UI, see the declaration in the .cc file.
   struct UIUpdate;
   typedef std::vector<UIUpdate> UpdateVector;
 
   // Lists all UI updates that are pending. We don't update things like the
   // URL or tab title right away to avoid flickering and extra painting.
   // See ScheduleUIUpdate and ProcessPendingUIUpdates.
   UpdateVector scheduled_updates_;
@@ skipping 51 matching lines @@
   // The browser idle task helps cleanup unused memory resources when idle.
   scoped_ptr<BrowserIdleTimer> idle_task_;
 
   // Keep track of the encoding auto detect pref.
   BooleanPrefMember encoding_auto_detect_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_H_