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

chrome/browser/search/instant_service.cc

 // Copyright 2013 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/search/instant_service.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 314 matching lines @@
   }
 
   // Set colors.
   theme_info_->background_color = SkColorToRGBAColor(background_color);
   theme_info_->text_color = SkColorToRGBAColor(text_color);
   theme_info_->link_color = SkColorToRGBAColor(link_color);
   theme_info_->text_color_light = SkColorToRGBAColor(text_color_light);
   theme_info_->header_color = SkColorToRGBAColor(header_color);
   theme_info_->section_border_color = SkColorToRGBAColor(section_border_color);
 
-  // Set logo for the theme. By default, use alternate logo.
-  theme_info_->logo_alternate = true;
-  int logo_alternate = 0;
-  if (theme_service->GetDisplayProperty(
-      ThemeProperties::NTP_LOGO_ALTERNATE, &logo_alternate))
-    theme_info_->logo_alternate = logo_alternate == 1;
+  int logo_alternate = theme_service->GetDisplayProperty(
+      ThemeProperties::NTP_LOGO_ALTERNATE);
+  theme_info_->logo_alternate = logo_alternate == 1;
 
   if (theme_service->HasCustomImage(IDR_THEME_NTP_BACKGROUND)) {
     // Set theme id for theme background image url.
     theme_info_->theme_id = theme_service->GetThemeID();
 
     // Set theme background image horizontal alignment.
-    int alignment = 0;
-    theme_service->GetDisplayProperty(
-        ThemeProperties::NTP_BACKGROUND_ALIGNMENT, &alignment);
+    int alignment = theme_service->GetDisplayProperty(
+        ThemeProperties::NTP_BACKGROUND_ALIGNMENT);
     if (alignment & ThemeProperties::ALIGN_LEFT)
       theme_info_->image_horizontal_alignment = THEME_BKGRND_IMAGE_ALIGN_LEFT;
     else if (alignment & ThemeProperties::ALIGN_RIGHT)
       theme_info_->image_horizontal_alignment = THEME_BKGRND_IMAGE_ALIGN_RIGHT;
     else
       theme_info_->image_horizontal_alignment = THEME_BKGRND_IMAGE_ALIGN_CENTER;
 
     // Set theme background image vertical alignment.
     if (alignment & ThemeProperties::ALIGN_TOP)
       theme_info_->image_vertical_alignment = THEME_BKGRND_IMAGE_ALIGN_TOP;
     else if (alignment & ThemeProperties::ALIGN_BOTTOM)
       theme_info_->image_vertical_alignment = THEME_BKGRND_IMAGE_ALIGN_BOTTOM;
     else
       theme_info_->image_vertical_alignment = THEME_BKGRND_IMAGE_ALIGN_CENTER;
 
     // Set theme backgorund image tiling.
-    int tiling = 0;
-    theme_service->GetDisplayProperty(ThemeProperties::NTP_BACKGROUND_TILING,
-                                      &tiling);
+    int tiling = theme_service->GetDisplayProperty(
+        ThemeProperties::NTP_BACKGROUND_TILING);
     switch (tiling) {
       case ThemeProperties::NO_REPEAT:
         theme_info_->image_tiling = THEME_BKGRND_IMAGE_NO_REPEAT;
         break;
       case ThemeProperties::REPEAT_X:
         theme_info_->image_tiling = THEME_BKGRND_IMAGE_REPEAT_X;
         break;
       case ThemeProperties::REPEAT_Y:
         theme_info_->image_tiling = THEME_BKGRND_IMAGE_REPEAT_Y;
         break;
@@ skipping 12 matching lines @@
        theme_service->HasCustomImage(IDR_THEME_NTP_ATTRIBUTION);
   }
 
   FOR_EACH_OBSERVER(InstantServiceObserver, observers_,
                     ThemeInfoChanged(*theme_info_));
 }
 
 InstantNTPPrerenderer* InstantService::ntp_prerenderer() {
   return &ntp_prerenderer_;
 }