Revert import bookmarks tip and bookmark bar removal on NTP (Merge of r53804 on trunk).

BUG=49328
TEST=NTP back to normal after import, with detached bookmark bar showing promo for importing bookmarks.

Review URL: http://codereview.chromium.org/3036024

git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@54071 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 1 insertions, 166 deletions

diff --git a/chrome/browser/dom_ui/dom_ui_unittest.cc b/chrome/browser/dom_ui/dom_ui_unittest.cc
index 8c00663..51f5e1e 100644
--- a/chrome/browser/dom_ui/dom_ui_unittest.cc
+++ b/chrome/browser/dom_ui/dom_ui_unittest.cc
@@ -84,7 +84,6 @@ class DOMUITest : public RenderViewHostTestHarness {
 // TabContents when we first navigate to a DOM UI page, then to a standard
 // non-DOM-UI page.
 TEST_F(DOMUITest, DOMUIToStandard) {
-  profile_->CreateBookmarkModel(true);
   DoNavigationTest(contents(), 1);
 
   // Test the case where we're not doing the initial navigation. This is
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index d367db3..6d2bdde 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -15,9 +15,7 @@
 #include "base/i18n/rtl.h"
 #include "base/singleton.h"
 #include "base/thread.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
-#include "chrome/browser/browser_window.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_ui/app_launcher_handler.h"
 #include "chrome/browser/dom_ui/dom_ui_theme_source.h"
@@ -26,7 +24,6 @@
 #include "chrome/browser/dom_ui/ntp_resource_cache.h"
 #include "chrome/browser/dom_ui/shown_sections_handler.h"
 #include "chrome/browser/dom_ui/tips_handler.h"
-#include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
@@ -41,11 +38,6 @@
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 
-#if defined(OS_WIN)
-#include "chrome/browser/views/importer_view.h"
-#include "views/window/window.h"
-#endif
-
 namespace {
 
 // The number of recent bookmarks we show.
@@ -437,43 +429,6 @@ void NewTabPageSetHomePageHandler::HandleSetHomePage(
   dom_ui_->CallJavascriptFunction(L"onHomePageSet", list_value);
 }
 
-///////////////////////////////////////////////////////////////////////////////
-// NewTabPageImportBookmarksHandler
-class NewTabPageImportBookmarksHandler : public DOMMessageHandler {
- public:
-  NewTabPageImportBookmarksHandler() {}
-  virtual ~NewTabPageImportBookmarksHandler() {}
-
-  // DOMMessageHandler implementation.
-  virtual void RegisterMessages();
-
-  // Callback for "importBookmarks".
-  void HandleImportBookmarks(const Value* value);
- private:
-
-  DISALLOW_COPY_AND_ASSIGN(NewTabPageImportBookmarksHandler);
-};
-
-void NewTabPageImportBookmarksHandler::RegisterMessages() {
-  dom_ui_->RegisterMessageCallback("importBookmarks", NewCallback(
-      this, &NewTabPageImportBookmarksHandler::HandleImportBookmarks));
-}
-
-void NewTabPageImportBookmarksHandler::HandleImportBookmarks(
-    const Value* value) {
-  Browser* browser = NULL;
-  TabContentsDelegate* delegate = dom_ui_->tab_contents()->delegate();
-  if (delegate)
-    browser = delegate->GetBrowser();
-  DCHECK(browser);
-#if defined(OS_WIN)
-  views::Window::CreateChromeWindow(
-      browser->window()->GetNativeHandle(),
-      gfx::Rect(),
-      new ImporterView(dom_ui_->GetProfile(), importer::FAVORITES))->Show();
-#endif
-}
-
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -499,10 +454,6 @@ NewTabUI::NewTabUI(TabContents* contents)
 
   static bool first_view = true;
   if (first_view) {
-    Profile* profile = GetProfile();
-    profile->GetPrefs()->SetInteger(prefs::kNTPPromoViewsRemaining,
-        profile->GetPrefs()->GetInteger(prefs::kNTPPromoViewsRemaining) - 1);
-    profile->GetBookmarkModel()->AddObserver(this);
     first_view = false;
   }
 
@@ -525,7 +476,6 @@ NewTabUI::NewTabUI(TabContents* contents)
     }
 
     AddMessageHandler((new NewTabPageSetHomePageHandler())->Attach(this));
-    AddMessageHandler((new NewTabPageImportBookmarksHandler())->Attach(this));
   }
 
   // Initializing the CSS and HTML can require some CPU, so do it after
@@ -550,9 +500,6 @@ NewTabUI::NewTabUI(TabContents* contents)
 }
 
 NewTabUI::~NewTabUI() {
-  BookmarkModel* bookmark_model = GetProfile()->GetBookmarkModel();
-  if (bookmark_model)
-    bookmark_model->RemoveObserver(this);
 }
 
 void NewTabUI::RenderViewCreated(RenderViewHost* render_view_host) {
@@ -563,14 +510,6 @@ void NewTabUI::RenderViewReused(RenderViewHost* render_view_host) {
   render_view_host->set_paint_observer(new PaintTimer);
 }
 
-void NewTabUI::BookmarkNodeAdded(BookmarkModel* model,
-                                 const BookmarkNode* parent,
-                                 int index) {
-  // Stop showing the promo, and no longer observe the bookmark model.
-  GetProfile()->GetPrefs()->SetInteger(prefs::kNTPPromoViewsRemaining, 0);
-  GetProfile()->GetBookmarkModel()->RemoveObserver(this);
-}
-
 void NewTabUI::Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
diff --git a/chrome/browser/dom_ui/new_tab_ui.h b/chrome/browser/dom_ui/new_tab_ui.h
index 7598764..e8a7b4f 100644
--- a/chrome/browser/dom_ui/new_tab_ui.h
+++ b/chrome/browser/dom_ui/new_tab_ui.h
@@ -8,7 +8,6 @@
 #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"
@@ -20,8 +19,7 @@ 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();
@@ -31,29 +29,6 @@ class NewTabUI : public DOMUI,
   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);
diff --git a/chrome/browser/dom_ui/new_tab_ui_uitest.cc b/chrome/browser/dom_ui/new_tab_ui_uitest.cc
index 1265cbe..ba6f8f4 100644
--- a/chrome/browser/dom_ui/new_tab_ui_uitest.cc
+++ b/chrome/browser/dom_ui/new_tab_ui_uitest.cc
@@ -98,70 +98,3 @@ TEST_F(NewTabUITest, UpdateUserPrefsVersion) {
   ASSERT_FALSE(migrated);
 }
 
-TEST_F(NewTabUITest, HomePageLink) {
-  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
-  ASSERT_TRUE(browser.get());
-
-  ASSERT_TRUE(
-      browser->SetBooleanPreference(prefs::kHomePageIsNewTabPage, false));
-
-  // Bring up a new tab page.
-  ASSERT_TRUE(browser->RunCommand(IDC_NEW_TAB));
-  int load_time;
-  ASSERT_TRUE(automation()->WaitForInitialNewTabUILoad(&load_time));
-
-  scoped_refptr<TabProxy> tab = browser->GetActiveTab();
-  ASSERT_TRUE(tab.get());
-
-  // TODO(arv): Extract common patterns for doing js testing.
-
-  // Fire click. Because tip service is turned off for testing, we first
-  // force the "make this my home page" tip to appear.
-  // TODO(arv): Find screen position of element and use a lower level click
-  // emulation.
-  bool result;
-  ASSERT_TRUE(tab->ExecuteAndExtractBool(L"",
-    L"window.domAutomationController.send("
-    L"(function() {"
-    L"  tipCache = [{\"set_homepage_tip\":\"Make this the home page\"}];"
-    L"  renderTip();"
-    L"  var e = document.createEvent('Event');"
-    L"  e.initEvent('click', true, true);"
-    L"  var el = document.querySelector('#tip-line > button');"
-    L"  el.dispatchEvent(e);"
-    L"  return true;"
-    L"})()"
-    L")",
-    &result));
-  ASSERT_TRUE(result);
-
-  // Make sure text of "set as home page" tip has been removed.
-  std::wstring tip_text_content;
-  ASSERT_TRUE(tab->ExecuteAndExtractString(L"",
-    L"window.domAutomationController.send("
-    L"(function() {"
-    L"  var el = document.querySelector('#tip-line');"
-    L"  return el.textContent;"
-    L"})()"
-    L")",
-    &tip_text_content));
-  ASSERT_EQ(L"", tip_text_content);
-
-  // Make sure that the notification is visible
-  bool has_class;
-  ASSERT_TRUE(tab->ExecuteAndExtractBool(L"",
-    L"window.domAutomationController.send("
-    L"(function() {"
-    L"  var el = document.querySelector('#notification');"
-    L"  return el.classList.contains('show');"
-    L"})()"
-    L")",
-    &has_class));
-  ASSERT_TRUE(has_class);
-
-  bool is_home_page;
-  ASSERT_TRUE(browser->GetBooleanPreference(prefs::kHomePageIsNewTabPage,
-                                            &is_home_page));
-  ASSERT_TRUE(is_home_page);
-}
-
diff --git a/chrome/browser/dom_ui/tips_handler.cc b/chrome/browser/dom_ui/tips_handler.cc
index 6a8a2f4f..1a7b59c 100644
--- a/chrome/browser/dom_ui/tips_handler.cc
+++ b/chrome/browser/dom_ui/tips_handler.cc
@@ -54,17 +54,6 @@ void TipsHandler::HandleGetTips(const Value* content) {
     }
   }
 
-  // If the user has just started using Chrome with a fresh profile, send only
-  // the "Import bookmarks" promo until the user has either seen it five times
-  // or added or imported bookmarks.
-  if (current_prefs->GetInteger(prefs::kNTPPromoViewsRemaining) > 0) {
-    SendTip(WideToUTF8(l10n_util::GetStringF(IDS_IMPORT_BOOKMARKS_PROMO,
-        std::wstring(L"<button class='link'>"),
-        std::wstring(L"</button>"))),
-        L"set_promo_tip", 0);
-    return;
-  }
-
   if (tips_cache_ != NULL && !tips_cache_->empty()) {
     if (tips_cache_->GetInteger(
         WebResourceService::kCurrentTipPrefName, &current_tip_index) &&