Remove the theme popup menu and just have a reset button to match the other p...

chrome/browser/cocoa/preferences_window_controller.mm

 // Copyright (c) 2009 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.
 
 #import "chrome/browser/cocoa/preferences_window_controller.h"
 
 #include "app/l10n_util.h"
 #include "base/mac_util.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
@@ skipping 623 matching lines @@
 
 // Called to clear user's browsing data. This puts up an application-modal
 // dialog to guide the user through clearing the data.
 - (IBAction)clearData:(id)sender {
   scoped_nsobject<ClearBrowsingDataController> controller(
       [[ClearBrowsingDataController alloc]
           initWithProfile:profile_]);
   [controller runModalDialog];
 }
 
-- (NSArray*)availableThemes {
-  const ExtensionList* extensions =
-      profile_->GetExtensionsService()->extensions();
-
-  NSMutableArray* themes = [NSMutableArray array];
-
-  for (size_t i = 0; i < extensions->size(); ++i) {
-    Extension* extension = extensions->at(i);
-    if (!extension->IsTheme())
-      continue;
-
-    NSDictionary* theme =
-        [NSDictionary dictionaryWithObjectsAndKeys:
-         [NSString stringWithUTF8String:extension->name().c_str()], @"name",
-         [NSString stringWithUTF8String:extension->id().c_str()], @"id",
-         nil];
-    [themes addObject:theme];
-  }
-
-  NSSortDescriptor* sortDescriptor =
-      [[[NSSortDescriptor alloc] initWithKey:@"name"
-                                   ascending:YES
-                                    selector:@selector(localizedCompare:)]
-       autorelease];
-
-  [themes sortUsingDescriptors:[NSArray arrayWithObject:sortDescriptor]];
-
-  NSMutableArray* themeNames = [NSMutableArray array];
-  NSMutableArray* themeIds = [NSMutableArray array];
-
-  for (NSDictionary* themeDict in themes) {
-    [themeNames addObject:[themeDict objectForKey:@"name"]];
-    [themeIds addObject:[themeDict objectForKey:@"id"]];
-  }
-
-  themeMenuOffset_ = 0;
-  if ([themeNames count] > 0) {
-    [themeNames insertObject:@"-" atIndex:0];
-    ++themeMenuOffset_;
-  }
-  NSString* defaultLabel =
-      [NSString stringWithUTF8String:
-       l10n_util::GetStringUTF8(IDS_THEMES_DEFAULT_THEME_LABEL).c_str()];
-  [themeNames insertObject:defaultLabel atIndex:0];
-  ++themeMenuOffset_;
-
-  themeIds_.reset([themeIds retain]);
-  return themeNames;
-}
-
-- (int)currentTheme {
-  const Extension* theme = profile_->GetTheme();
-
-  if (theme) {
-    NSString* themeId = [NSString stringWithUTF8String:theme->id().c_str()];
-    return [themeIds_.get() indexOfObject:themeId] + themeMenuOffset_;
-  }
-
-  return 0;
-}
-
-- (void)setCurrentTheme:(int)newTheme {
-  newTheme -= themeMenuOffset_;
-
-  if (newTheme < 0) {
-    [self recordUserAction:L"Options_ThemesReset"];
-    profile_->ClearTheme();
-  } else {
-    NSString* themeId = [themeIds_.get() objectAtIndex:newTheme];
-    Extension* extension =
-        profile_->GetExtensionsService()->
-         GetExtensionById([themeId UTF8String]);
-    profile_->SetTheme(extension);
-  }
+- (IBAction)resetThemeToDefault:(id)sender {
+  [self recordUserAction:L"Options_ThemesReset"];
+  profile_->ClearTheme();
 }
 
 - (IBAction)themesGallery:(id)sender {
   [self recordUserAction:L"Options_ThemesGallery"];
   Browser* browser =
       BrowserList::FindBrowserWithType(profile_, Browser::TYPE_NORMAL);
 
   if (!browser || !browser->GetSelectedTabContents()) {
     browser = Browser::Create(profile_);
     browser->OpenURL(
@@ skipping 222 matching lines @@
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kUserDoneEditingPrefsNotification
                     object:self];
 }
 
 - (void)controlTextDidEndEditing:(NSNotification*)notification {
   [customPagesSource_ validateURLs];
 }
 
 @end