Revert bookmark bar promo CL, r52993...

chrome/browser/dom_ui/new_tab_ui.cc

 // 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.
 
 #include "build/build_config.h"
 
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 
 #include <set>
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/histogram.h"
 #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"
 #include "chrome/browser/dom_ui/most_visited_handler.h"
 #include "chrome/browser/dom_ui/new_tab_page_sync_handler.h"
 #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"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #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.
 const int kRecentBookmarks = 9;
 
 // The number of search URLs to show.
 const int kSearchURLs = 3;
 
 // Strings sent to the page via jstemplates used to set the direction of the
 // HTML document based on locale.
@@ skipping 371 matching lines @@
   dom_ui_->GetProfile()->GetPrefs()->SetBoolean(prefs::kHomePageIsNewTabPage,
                                                 true);
   ListValue list_value;
   list_value.Append(new StringValue(
       l10n_util::GetString(IDS_NEW_TAB_HOME_PAGE_SET_NOTIFICATION)));
   list_value.Append(new StringValue(
       l10n_util::GetString(IDS_NEW_TAB_HOME_PAGE_HIDE_NOTIFICATION)));
   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
 
 ///////////////////////////////////////////////////////////////////////////////
 // NewTabUI
 
 NewTabUI::NewTabUI(TabContents* contents)
     : DOMUI(contents) {
   // Override some options on the DOM UI.
   hide_favicon_ = true;
   force_bookmark_bar_visible_ = true;
   force_extension_shelf_visible_ = true;
   focus_location_bar_by_default_ = true;
   should_hide_url_ = true;
   overridden_title_ = WideToUTF16Hack(l10n_util::GetString(IDS_NEW_TAB_TITLE));
 
   // We count all link clicks as AUTO_BOOKMARK, so that site can be ranked more
   // highly. Note this means we're including clicks on not only most visited
   // thumbnails, but also clicks on recently bookmarked.
   link_transition_type_ = PageTransition::AUTO_BOOKMARK;
 
   if (NewTabUI::FirstRunDisabled())
     NewTabHTMLSource::set_first_run(false);
 
   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;
   }
 
   if (!GetProfile()->IsOffTheRecord()) {
     PrefService* pref_service = GetProfile()->GetPrefs();
     AddMessageHandler((new ShownSectionsHandler(pref_service))->Attach(this));
     AddMessageHandler((new MostVisitedHandler())->Attach(this));
     AddMessageHandler((new RecentlyClosedTabsHandler())->Attach(this));
     AddMessageHandler((new MetricsHandler())->Attach(this));
     if (WebResourcesEnabled())
       AddMessageHandler((new TipsHandler())->Attach(this));
     if (GetProfile()->IsSyncAccessible())
       AddMessageHandler((new NewTabPageSyncHandler())->Attach(this));
     if (Extension::AppsAreEnabled()) {
       ExtensionsService* service = GetProfile()->GetExtensionsService();
       // We might not have an ExtensionsService (on ChromeOS when not logged in
       // for example).
       if (service)
         AddMessageHandler((new AppLauncherHandler(service))->Attach(this));
     }
 
     AddMessageHandler((new NewTabPageSetHomePageHandler())->Attach(this));
-    AddMessageHandler((new NewTabPageImportBookmarksHandler())->Attach(this));
   }
 
   // Initializing the CSS and HTML can require some CPU, so do it after
   // we've hooked up the most visited handler.  This allows the DB query
   // for the new tab thumbs to happen earlier.
   InitializeCSSCaches();
   NewTabHTMLSource* html_source =
       new NewTabHTMLSource(GetProfile()->GetOriginalProfile());
   ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
       NewRunnableMethod(
           Singleton<ChromeURLDataManager>::get(),
           &ChromeURLDataManager::AddDataSource,
           make_scoped_refptr(html_source)));
 
   // Listen for theme installation.
   registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
   // Listen for bookmark bar visibility changes.
   registrar_.Add(this, NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,
                  NotificationService::AllSources());
 }
 
 NewTabUI::~NewTabUI() {
-  BookmarkModel* bookmark_model = GetProfile()->GetBookmarkModel();
-  if (bookmark_model)
-    bookmark_model->RemoveObserver(this);
 }
 
 void NewTabUI::RenderViewCreated(RenderViewHost* render_view_host) {
   render_view_host->set_paint_observer(new PaintTimer);
 }
 
 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) {
   if (NotificationType::BROWSER_THEME_CHANGED == type) {
     InitializeCSSCaches();
     CallJavascriptFunction(L"themeChanged");
   } else if (NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED) {
     if (GetProfile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar))
       CallJavascriptFunction(L"bookmarkBarAttached");
     else
@@ skipping 126 matching lines @@
     // URL from the new tab page, but in any case it's an error.
     NOTREACHED();
     return;
   }
 
   scoped_refptr<RefCountedBytes> html_bytes =
       profile_->GetNTPResourceCache()->GetNewTabHTML(is_off_the_record);
 
   SendResponse(request_id, html_bytes);
 }