retry r123804 - ntp theme fixes

chrome/browser/themes/theme_service.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/themes/theme_service.h"
 
 #include "base/bind.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 11 matching lines @@
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include "ui/views/widget/native_widget_win.h"
 #endif
 
 using content::BrowserThread;
 using content::UserMetricsAction;
 
 // Strings used in alignment properties.
+const char* ThemeService::kAlignmentCenter = "center";
 const char* ThemeService::kAlignmentTop = "top";
 const char* ThemeService::kAlignmentBottom = "bottom";
 const char* ThemeService::kAlignmentLeft = "left";
 const char* ThemeService::kAlignmentRight = "right";
 
 // Strings used in background tiling repetition properties.
 const char* ThemeService::kTilingNoRepeat = "no-repeat";
 const char* ThemeService::kTilingRepeatX = "repeat-x";
 const char* ThemeService::kTilingRepeatY = "repeat-y";
 const char* ThemeService::kTilingRepeat = "repeat";
@@ skipping 328 matching lines @@
   return UsingDefaultTheme();
 }
 
 std::string ThemeService::GetThemeID() const {
   return profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
 }
 
 // static
 std::string ThemeService::AlignmentToString(int alignment) {
   // Convert from an AlignmentProperty back into a string.
-  std::string vertical_string;
-  std::string horizontal_string;
+  std::string vertical_string(kAlignmentCenter);
+  std::string horizontal_string(kAlignmentCenter);
 
   if (alignment & ThemeService::ALIGN_TOP)
     vertical_string = kAlignmentTop;
   else if (alignment & ThemeService::ALIGN_BOTTOM)
     vertical_string = kAlignmentBottom;
 
   if (alignment & ThemeService::ALIGN_LEFT)
     horizontal_string = kAlignmentLeft;
   else if (alignment & ThemeService::ALIGN_RIGHT)
     horizontal_string = kAlignmentRight;
 
-  if (vertical_string.empty())
-    return horizontal_string;
-  if (horizontal_string.empty())
-    return vertical_string;
-  return vertical_string + " " + horizontal_string;
+  return horizontal_string + " " + vertical_string;
 }
 
 // static
 int ThemeService::StringToAlignment(const std::string& alignment) {
   std::vector<std::string> split;
   base::SplitStringAlongWhitespace(alignment, &split);
 
   int alignment_mask = 0;
   for (std::vector<std::string>::iterator component(split.begin());
        component != split.end(); ++component) {
@@ skipping 264 matching lines @@
 void ThemeService::OnInfobarDisplayed() {
   number_of_infobars_++;
 }
 
 void ThemeService::OnInfobarDestroyed() {
   number_of_infobars_--;
 
   if (number_of_infobars_ == 0)
     RemoveUnusedThemes();
 }