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

chrome/browser/themes/browser_theme_provider.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/themes/browser_theme_provider.h"
 
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 17 matching lines @@
 const char* BrowserThemeProvider::kAlignmentBottom = "bottom";
 const char* BrowserThemeProvider::kAlignmentLeft = "left";
 const char* BrowserThemeProvider::kAlignmentRight = "right";
 
 // Strings used in background tiling repetition properties.
 const char* BrowserThemeProvider::kTilingNoRepeat = "no-repeat";
 const char* BrowserThemeProvider::kTilingRepeatX = "repeat-x";
 const char* BrowserThemeProvider::kTilingRepeatY = "repeat-y";
 const char* BrowserThemeProvider::kTilingRepeat = "repeat";
 
-// Saved default values.
+// The default theme if we haven't installed a theme yet or if we've clicked
+// the "Use Classic" button.
 const char* BrowserThemeProvider::kDefaultThemeID = "";
 
 namespace {
 
+// The default theme if we've gone to the theme gallery and installed the
+// "Default" theme. We have to detect this case specifically. (By the time we
+// realize we've installed the default theme, we already have an extension
+// unpacked on the filesystem.)
+const char* kDefatulThemeGalleryID = "hkacjpbfdknhflllbcmjibkdeoafencn";

[Miranda Callahan, 2011/02/17 21:41:46]

s/fatul/fault ;-)

+
 SkColor TintForUnderline(SkColor input) {
   return SkColorSetA(input, SkColorGetA(input) / 3);
 }
 
 SkColor IncreaseLightness(SkColor color, double percent) {
   color_utils::HSL result;
   color_utils::SkColorToHSL(color, &result);
   result.l += (1 - result.l) * percent;
   return color_utils::HSLToSkColor(result, SkColorGetA(color));
 }
@@ skipping 271 matching lines @@
   ClearAllThemeData();
   NotifyThemeChanged(NULL);
   UserMetrics::RecordAction(UserMetricsAction("Themes_Reset"), profile_);
 }
 
 void BrowserThemeProvider::SetNativeTheme() {
   UseDefaultTheme();
 }
 
 bool BrowserThemeProvider::UsingDefaultTheme() {
-  return GetThemeID() == BrowserThemeProvider::kDefaultThemeID;
+  std::string id = GetThemeID();
+  return id == BrowserThemeProvider::kDefaultThemeID ||
+      id == kDefatulThemeGalleryID;

[Miranda Callahan, 2011/02/17 21:41:46]

I actually kind of like the word "Defatul," but still...

[Evan Stade, 2011/02/17 22:13:17]

I wonder, how do you pronounce it?

 }
 
 std::string BrowserThemeProvider::GetThemeID() const {
   return profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
 }
 
 // static
 std::string BrowserThemeProvider::AlignmentToString(int alignment) {
   // Convert from an AlignmentProperty back into a string.
   std::string vertical_string;
@@ skipping 281 matching lines @@
 void BrowserThemeProvider::OnInfobarDisplayed() {
   number_of_infobars_++;
 }
 
 void BrowserThemeProvider::OnInfobarDestroyed() {
   number_of_infobars_--;
 
   if (number_of_infobars_ == 0)
     RemoveUnusedThemes();
 }