retry r123804 - ntp theme fixes

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

 // Copyright (c) 2012 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>
 
@@ skipping 115 matching lines @@
     web_ui->AddMessageHandler(new NTPLoginHandler());
 
   // 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());
   GetProfile()->GetChromeURLDataManager()->AddDataSource(html_source);
 
+  pref_change_registrar_.Init(GetProfile()->GetPrefs());
+  pref_change_registrar_.Add(prefs::kShowBookmarkBar, this);
   // Listen for theme installation.
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(GetProfile())));
 }
 
 NewTabUI::~NewTabUI() {
   g_live_new_tabs.Pointer()->erase(this);
 }
 
@@ skipping 44 matching lines @@
 }
 
 void NewTabUI::RenderViewReused(RenderViewHost* render_view_host) {
   StartTimingPaint(render_view_host);
 }
 
 void NewTabUI::Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) {
   switch (type) {
+    case chrome::NOTIFICATION_PREF_CHANGED: {  // kShowBookmarkBar
+      StringValue attached(
+          GetProfile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar) ?
+              "true" : "false");
+      web_ui()->CallJavascriptFunction("ntp4.setBookmarkBarAttached", attached);
+      break;
+    }
     case chrome::NOTIFICATION_BROWSER_THEME_CHANGED: {
       InitializeCSSCaches();
-      ListValue args;
-      args.Append(Value::CreateStringValue(
+      StringValue attribution(
           ThemeServiceFactory::GetForProfile(GetProfile())->HasCustomImage(
-              IDR_THEME_NTP_ATTRIBUTION) ?
-          "true" : "false"));
-      web_ui()->CallJavascriptFunction("themeChanged", args);
+              IDR_THEME_NTP_ATTRIBUTION) ? "true" : "false");
+      web_ui()->CallJavascriptFunction("themeChanged", attribution);
       break;
     }
     case content::NOTIFICATION_RENDER_WIDGET_HOST_DID_PAINT: {
       last_paint_ = base::TimeTicks::Now();
       break;
     }
     default:
       CHECK(false) << "Unexpected notification: " << type;
   }
 }
@@ skipping 19 matching lines @@
 
   // Try to give the user a consistent experience, if possible.
   if (base::FieldTrialList::IsOneTimeRandomizationEnabled())
     trial->UseOneTimeRandomization();
 
   // 4% in each group.
   g_footer_group = trial->AppendGroup("FooterLink", 40);
   g_hint_group = trial->AppendGroup("PlusIcon", 40);
 }
 
-
 // static
 bool NewTabUI::ShouldShowWebStoreFooterLink() {
   const CommandLine* cli = CommandLine::ForCurrentProcess();
   return cli->HasSwitch(switches::kEnableWebStoreLink) ||
       WebStoreLinkExperimentGroupIs(g_footer_group);
 }
 
 // static
 bool NewTabUI::ShouldShowAppInstallHint() {
   const CommandLine* cli = CommandLine::ForCurrentProcess();
@@ skipping 75 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;
 }