MD Settings: simplify logic for whether themes can be reset

chrome/browser/ui/webui/settings/appearance_handler.cc

 // Copyright (c) 2015 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/ui/webui/settings/appearance_handler.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 25 matching lines @@
       base::Bind(&AppearanceHandler::GetResetThemeEnabled,
                  base::Unretained(this)));
 }
 
 void AppearanceHandler::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_BROWSER_THEME_CHANGED: {
-      base::StringValue event("reset-theme-enabled-changed");
-      base::FundamentalValue enabled(QueryResetThemeEnabledState());
       web_ui()->CallJavascriptFunction(
-          "cr.webUIListenerCallback", event, enabled);
+          "cr.webUIListenerCallback",
+          base::StringValue("reset-theme-enabled-changed"),
+          base::FundamentalValue(ResetThemeEnabled()));
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
 void AppearanceHandler::ResetTheme(const base::ListValue* /* args */) {
-  Profile* profile = Profile::FromWebUI(web_ui());
-  ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
+  ThemeServiceFactory::GetForProfile(profile_)->UseDefaultTheme();
 }
 
-base::FundamentalValue AppearanceHandler::QueryResetThemeEnabledState() {
-  ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile_);
-  bool is_system_theme = false;
-
+bool AppearanceHandler::ResetThemeEnabled() const {
   // TODO(jhawkins): Handle native/system theme button.
-
-  bool is_classic_theme = !is_system_theme &&
-                          theme_service->UsingDefaultTheme();
-  return base::FundamentalValue(!is_classic_theme);
+  return !ThemeServiceFactory::GetForProfile(profile_)->UsingDefaultTheme();
 }
 
 void AppearanceHandler::GetResetThemeEnabled(const base::ListValue* args) {
   CHECK_EQ(1U, args->GetSize());
   const base::Value* callback_id;
   CHECK(args->Get(0, &callback_id));
 
-  base::FundamentalValue enabled(QueryResetThemeEnabledState());
-  ResolveJavascriptCallback(*callback_id, enabled);
+  ResolveJavascriptCallback(*callback_id,
+                            base::FundamentalValue(ResetThemeEnabled()));
 }
 
 }  // namespace settings