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

chrome/browser/themes/theme_properties.cc

 // Copyright (c) 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/themes/theme_properties.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/themes/browser_theme_pack.h"
@@ skipping 53 matching lines @@
 // Default tints.
 const color_utils::HSL kDefaultTintButtons = { -1, -1, -1 };
 const color_utils::HSL kDefaultTintFrame = { -1, -1, -1 };
 const color_utils::HSL kDefaultTintFrameInactive = { -1, -1, 0.75f };
 const color_utils::HSL kDefaultTintFrameIncognito = { -1, 0.2f, 0.35f };
 const color_utils::HSL kDefaultTintFrameIncognitoInactive = { -1, 0.3f, 0.6f };
 const color_utils::HSL kDefaultTintBackgroundTab = { -1, 0.5, 0.75 };
 
 // Default display properties.
 const int kDefaultDisplayPropertyNTPAlignment =
-    ThemeProperties::ALIGN_BOTTOM;
+    ThemeProperties::ALIGN_CENTER;
 const int kDefaultDisplayPropertyNTPTiling =
     ThemeProperties::NO_REPEAT;
-const int kDefaultDisplayPropertyNTPInverseLogo = 0;
+// By default, we do not use the ntp alternate logo.
+const int kDefaultDisplayPropertyNTPAlternateLogo = 0;
 
 // ----------------------------------------------------------------------------
 // Defaults for properties which are not stored in the browser theme pack.
 
 const SkColor kDefaultColorControlBackground = SK_ColorWHITE;
 const SkColor kDefaultColorToolbarSeparator = SkColorSetRGB(170, 170, 171);
 
 #if defined(OS_MACOSX)
 const SkColor kDefaultColorToolbarButtonStroke = SkColorSetARGB(75, 81, 81, 81);
 const SkColor kDefaultColorToolbarButtonStrokeInactive =
@@ skipping 207 matching lines @@
     case COLOR_TOOLBAR_STROKE_INACTIVE:
       return kDefaultColorToolbarStrokeInactive;
 #endif
     default:
       // Return a debugging red color.
       return SK_ColorRED;
   }
 }
 
 // static
-bool ThemeProperties::GetDefaultDisplayProperty(int id, int* result) {
+int ThemeProperties::GetDefaultDisplayProperty(int id) {
   switch (id) {
     case NTP_BACKGROUND_ALIGNMENT:
-      *result = kDefaultDisplayPropertyNTPAlignment;
-      return true;
+      return kDefaultDisplayPropertyNTPAlignment;
     case NTP_BACKGROUND_TILING:
-      *result = kDefaultDisplayPropertyNTPTiling;
-      return true;
+      return kDefaultDisplayPropertyNTPTiling;
     case NTP_LOGO_ALTERNATE:
-      *result = kDefaultDisplayPropertyNTPInverseLogo;
-      return true;
+      return kDefaultDisplayPropertyNTPAlternateLogo;
   }
 
-  return false;
+  return -1;
 }