Revert bookmark bar promo CL, r52993...

chrome/browser/dom_ui/new_tab_ui.h

 // Copyright (c) 2010 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_DOM_UI_NEW_TAB_UI_H_
 #define CHROME_BROWSER_DOM_UI_NEW_TAB_UI_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
-#include "chrome/browser/bookmarks/bookmark_model_observer.h"
 #include "chrome/browser/dom_ui/dom_ui.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/common/notification_registrar.h"
 
 class GURL;
 class MessageLoop;
 class PrefService;
 class Profile;
 
 // The TabContents used for the New Tab page.
 class NewTabUI : public DOMUI,
-                 public NotificationObserver,
-                 public BookmarkModelObserver {
+                 public NotificationObserver {
  public:
   explicit NewTabUI(TabContents* manager);
   ~NewTabUI();
 
   // Override DOMUI methods so we can hook up the paint timer to the render
   // view host.
   virtual void RenderViewCreated(RenderViewHost* render_view_host);
   virtual void RenderViewReused(RenderViewHost* render_view_host);
 
-  // Overridden from BookmarkModelObserver so we can remove the promo for
-  // importing bookmarks if the user adds a bookmark in any way.
-  virtual void BookmarkNodeAdded(BookmarkModel* model,
-    const BookmarkNode* parent,
-    int index);
-
-  // These methods must be overridden so that the NTP can be a
-  // BookmarkModelObserver.
-  virtual void Loaded(BookmarkModel* model) {}
-  virtual void BookmarkModelBeingDeleted(BookmarkModel* model) {}
-  virtual void BookmarkNodeMoved(BookmarkModel* model,
-    const BookmarkNode* old_parent, int old_index,
-    const BookmarkNode* new_parent, int new_index) {}
-  virtual void BookmarkNodeRemoved(BookmarkModel* model,
-    const BookmarkNode* parent, int old_index,
-    const BookmarkNode* node) {}
-  virtual void BookmarkNodeChanged(BookmarkModel* model,
-    const BookmarkNode* node) {}
-  virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
-    const BookmarkNode* node) {}
-  virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
-    const BookmarkNode* node) {}
-
   static void RegisterUserPrefs(PrefService* prefs);
   static void MigrateUserPrefs(PrefService* prefs, int old_pref_version,
                                int new_pref_version);
 
   // Whether we should disable the web resources backend service
   static bool WebResourcesEnabled();
 
   // Whether we should disable the first run notification based on the command
   // line switch.
   static bool FirstRunDisabled();
@@ skipping 53 matching lines @@
 
   NotificationRegistrar registrar_;
 
   // The preference version. This used for migrating prefs of the NTP.
   static const int current_pref_version_ = 2;
 
   DISALLOW_COPY_AND_ASSIGN(NewTabUI);
 };
 
 #endif  // CHROME_BROWSER_DOM_UI_NEW_TAB_UI_H_