Use the normal Google logo for managed users for --enable-instant-extended-api

chrome/browser/ui/webui/ntp/ntp_resource_cache.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 "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
 
 #include <string>
 #include <vector>
 
 #include "apps/app_launcher.h"
@@ skipping 109 matching lines @@
   // If web contents are being inverted because the system is in high-contrast
   // mode, any system theme colors we use must be inverted too to cancel out.
   return gfx::IsInvertedColorScheme() ?
       color_utils::InvertColor(color) : color;
 }
 
 // Get the CSS string for the background position on the new tab page for the
 // states when the bar is attached or detached.
 std::string GetNewTabBackgroundCSS(const ui::ThemeProvider* theme_provider,
                                    bool bar_attached) {
-  int alignment;
-  theme_provider->GetDisplayProperty(
-      ThemeProperties::NTP_BACKGROUND_ALIGNMENT, &alignment);
-
   // TODO(glen): This is a quick workaround to hide the notused.png image when
   // no image is provided - we don't have time right now to figure out why
   // this is painting as white.
   // http://crbug.com/17593
   if (!theme_provider->HasCustomImage(IDR_THEME_NTP_BACKGROUND)) {
     return "-64px";
   }
 
+  int alignment = theme_provider->GetDisplayProperty(
+      ThemeProperties::NTP_BACKGROUND_ALIGNMENT);
+
   if (bar_attached)
     return ThemeProperties::AlignmentToString(alignment);
 
   if (alignment & ThemeProperties::ALIGN_TOP) {
     // The bar is detached, so we must offset the background by the bar size
     // if it's a top-aligned bar.
     int offset = chrome::kNTPBookmarkBarHeight;
 
     if (alignment & ThemeProperties::ALIGN_LEFT)
       return "left " + base::IntToString(-offset) + "px";
     else if (alignment & ThemeProperties::ALIGN_RIGHT)
       return "right " + base::IntToString(-offset) + "px";
     return "center " + base::IntToString(-offset) + "px";
   }
 
   return ThemeProperties::AlignmentToString(alignment);
 }
 
 // How the background image on the new tab page should be tiled (see tiling
 // masks in theme_service.h).
 std::string GetNewTabBackgroundTilingCSS(
     const ui::ThemeProvider* theme_provider) {
-  int repeat_mode;
-  theme_provider->GetDisplayProperty(
-      ThemeProperties::NTP_BACKGROUND_TILING, &repeat_mode);
+  int repeat_mode = theme_provider->GetDisplayProperty(
+      ThemeProperties::NTP_BACKGROUND_TILING);
   return ThemeProperties::TilingToString(repeat_mode);
 }
 
 }  // namespace
 
 NTPResourceCache::NTPResourceCache(Profile* profile)
     : profile_(profile), is_swipe_tracking_from_scroll_events_enabled_(false),
       should_show_apps_page_(NewTabUI::ShouldShowApps()),
       should_show_most_visited_page_(true),
       should_show_other_devices_menu_(true),
@@ skipping 322 matching lines @@
 #endif
 
   NewTabPageHandler::GetLocalizedValues(profile_, &load_time_data);
   NTPLoginHandler::GetLocalizedValues(profile_, &load_time_data);
 
   webui::SetFontAndTextDirection(&load_time_data);
 
   // Control fade and resize animations.
   load_time_data.SetBoolean("anim", ui::Animation::ShouldRenderRichAnimation());
 
-  int alignment;
   ui::ThemeProvider* tp = ThemeServiceFactory::GetForProfile(profile_);
-  tp->GetDisplayProperty(ThemeProperties::NTP_BACKGROUND_ALIGNMENT,
-                         &alignment);
+  int alignment = tp->GetDisplayProperty(
+      ThemeProperties::NTP_BACKGROUND_ALIGNMENT);
   load_time_data.SetString("themegravity",
       (alignment & ThemeProperties::ALIGN_RIGHT) ? "right" : "");
 
   // Disable the promo if this is the first run, otherwise set the promo string
   // for display if there is a valid outstanding promo.
   if (first_run::IsChromeFirstRun()) {
     NotificationPromo::HandleClosed(NotificationPromo::NTP_NOTIFICATION_PROMO);
   } else {
     NotificationPromo notification_promo;
     notification_promo.InitFromPrefs(NotificationPromo::NTP_NOTIFICATION_PROMO);
@@ skipping 181 matching lines @@
   // Get our template.
   static const base::StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_NEW_TAB_4_THEME_CSS));
 
   // Create the string from our template and the replacements.
   std::string css_string;
   css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
   new_tab_css_ = base::RefCountedString::TakeString(&css_string);
 }