Disable "Reset to Default theme"/"Use classic theme" correctly.

chrome/browser/dom_ui/options/personal_options_handler.cc

 // Copyright (c) 2011 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/dom_ui/options/personal_options_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ skipping 276 matching lines @@
   bool is_gtk_theme = provider->UseGtkTheme();
   FundamentalValue gtk_enabled(!is_gtk_theme);
   web_ui_->CallJavascriptFunction(
       L"options.PersonalOptions.setGtkThemeButtonEnabled", gtk_enabled);
 #else
   BrowserThemeProvider* provider =
       reinterpret_cast<BrowserThemeProvider*>(profile->GetThemeProvider());
   bool is_gtk_theme = false;
 #endif
 
-  bool is_classic_theme = !is_gtk_theme && provider->GetThemeID().empty();
+  bool is_classic_theme = !is_gtk_theme && provider->UsingDefaultTheme();
   FundamentalValue enabled(!is_classic_theme);
   web_ui_->CallJavascriptFunction(
       L"options.PersonalOptions.setThemesResetButtonEnabled", enabled);
 }
 
 void PersonalOptionsHandler::Initialize() {
   banner_handler_.reset(
       new OptionsManagedBannerHandler(web_ui_,
                                       ASCIIToUTF16("PersonalOptions"),
                                       OPTIONS_PAGE_CONTENT));
@@ skipping 86 matching lines @@
   const SkBitmap& account_picture =
       chromeos::UserManager::Get()->logged_in_user().image();
 
   if (!account_picture.isNull()) {
     StringValue data_url(web_ui_util::GetImageDataUrl(account_picture));
     web_ui_->CallJavascriptFunction(L"PersonalOptions.setAccountPicture",
         data_url);
   }
 }
 #endif