Fixed behavior of the bookmark bar visibility.

chrome/browser/ui/webui/ntp/new_tab_ui.cc

 // Copyright (c) 2011 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/ui/webui/ntp/new_tab_ui.h"
 
-#include <set>
-
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
@@ skipping 46 matching lines @@
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // NewTabUI
 
 NewTabUI::NewTabUI(TabContents* contents)
     : ChromeWebUI(contents) {
   // Override some options on the Web UI.
   hide_favicon_ = true;
 
-  if (!NTP4BookmarkFeaturesEnabled() &&
-      GetProfile()->GetPrefs()->GetBoolean(prefs::kEnableBookmarkBar) &&
-      browser_defaults::bookmarks_enabled) {
-    set_force_bookmark_bar_visible(true);
-  }
-
   focus_location_bar_by_default_ = true;
   should_hide_url_ = true;
   overridden_title_ = l10n_util::GetStringUTF16(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 (!GetProfile()->IsOffTheRecord()) {
@@ skipping 29 matching lines @@
   NewTabHTMLSource* html_source =
       new NewTabHTMLSource(GetProfile()->GetOriginalProfile());
   Profile* profile = Profile::FromBrowserContext(contents->browser_context());
   profile->GetChromeURLDataManager()->AddDataSource(html_source);
 
   // Listen for theme installation.
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(GetProfile())));
   // Listen for bookmark bar visibility changes.
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,
-                 NotificationService::AllSources());
+  pref_change_registrar_.Init(GetProfile()->GetPrefs());
+  pref_change_registrar_.Add(prefs::kShowBookmarkBar, this);
 }
 
 NewTabUI::~NewTabUI() {
 }
 
 // The timer callback.  If enough time has elapsed since the last paint
 // message, we say we're done painting; otherwise, we keep waiting.
 void NewTabUI::PaintTimeout() {
   // The amount of time there must be no painting for us to consider painting
   // finished.  Observed times are in the ~1200ms range on Windows.
@@ skipping 26 matching lines @@
 
 }
 void NewTabUI::RenderViewCreated(RenderViewHost* render_view_host) {
   StartTimingPaint(render_view_host);
 }
 
 void NewTabUI::RenderViewReused(RenderViewHost* render_view_host) {
   StartTimingPaint(render_view_host);
 }
 
+bool NewTabUI::CanShowBookmarkBar() const {
+  PrefService* prefs = GetProfile()->GetPrefs();
+  bool disabled_by_policy =
+      prefs->IsManagedPreference(prefs::kShowBookmarkBar) &&
+      !prefs->GetBoolean(prefs::kShowBookmarkBar);
+  return
+      browser_defaults::bookmarks_enabled &&
+      !disabled_by_policy &&
+      !NTP4BookmarkFeaturesEnabled();
+}
+
 void NewTabUI::Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_BROWSER_THEME_CHANGED: {
       InitializeCSSCaches();
       ListValue args;
       args.Append(Value::CreateStringValue(
           ThemeServiceFactory::GetForProfile(GetProfile())->HasCustomImage(
               IDR_THEME_NTP_ATTRIBUTION) ?
           "true" : "false"));
       CallJavascriptFunction("themeChanged", args);
       break;
     }
-    case chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED: {
-      if (GetProfile()->GetPrefs()->IsManagedPreference(
-              prefs::kEnableBookmarkBar)) {
-        break;
-      }
-      if (!NTP4Enabled()) {
-        if (GetProfile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar))
-          CallJavascriptFunction("bookmarkBarAttached");
-        else
-          CallJavascriptFunction("bookmarkBarDetached");
+    case chrome::NOTIFICATION_PREF_CHANGED: {
+      const std::string& pref_name = *Details<std::string>(details).ptr();
+      if (pref_name == prefs::kShowBookmarkBar) {
+        if (!NTP4Enabled() && CanShowBookmarkBar()) {
+          if (GetProfile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar))
+            CallJavascriptFunction("bookmarkBarAttached");
+          else
+            CallJavascriptFunction("bookmarkBarDetached");
+        }
+      } else {
+        NOTREACHED();
       }
       break;
     }
     case content::NOTIFICATION_RENDER_WIDGET_HOST_DID_PAINT: {
       last_paint_ = base::TimeTicks::Now();
       break;
     }
     default:
       CHECK(false) << "Unexpected notification: " << type;
   }
@@ skipping 119 matching lines @@
   SendResponse(request_id, html_bytes);
 }
 
 std::string NewTabUI::NewTabHTMLSource::GetMimeType(const std::string&) const {
   return "text/html";
 }
 
 bool NewTabUI::NewTabHTMLSource::ShouldReplaceExistingSource() const {
   return false;
 }