Revert revision 176015

chrome/browser/extensions/api/font_settings/font_settings_api.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.
 
 // Font Settings Extension API implementation.
 
 #include "chrome/browser/extensions/api/font_settings/font_settings_api.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 199 matching lines @@
       pref_name);
 }
 
 FontSettingsAPI::FontSettingsAPI(Profile* profile)
     : font_settings_event_router_(new FontSettingsEventRouter(profile)) {
 }
 
 FontSettingsAPI::~FontSettingsAPI() {
 }
 
-bool FontSettingsClearFontFunction::RunImpl() {
+bool ClearFontFunction::RunImpl() {
   if (profile_->IsOffTheRecord()) {
     error_ = kSetFromIncognitoError;
     return false;
   }
 
   scoped_ptr<fonts::ClearFont::Params> params(
       fonts::ClearFont::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   std::string pref_path = GetFontNamePrefPath(params->details.generic_family,
                                               params->details.script);
 
   // Ensure |pref_path| really is for a registered per-script font pref.
   EXTENSION_FUNCTION_VALIDATE(
       profile_->GetPrefs()->FindPreference(pref_path.c_str()));
 
   ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(profile_)->
       extension_service()->extension_prefs();
   prefs->RemoveExtensionControlledPref(extension_id(),
                                        pref_path.c_str(),
                                        kExtensionPrefsScopeRegular);
   return true;
 }
 
-bool FontSettingsGetFontFunction::RunImpl() {
+bool GetFontFunction::RunImpl() {
   scoped_ptr<fonts::GetFont::Params> params(
       fonts::GetFont::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   std::string pref_path = GetFontNamePrefPath(params->details.generic_family,
                                               params->details.script);
 
   PrefService* prefs = profile_->GetPrefs();
   const PrefService::Preference* pref =
       prefs->FindPreference(pref_path.c_str());
@@ skipping 12 matching lines @@
                                                         pref_path,
                                                         kIncognito);
 
   DictionaryValue* result = new DictionaryValue();
   result->SetString(kFontIdKey, font_name);
   result->SetString(kLevelOfControlKey, level_of_control);
   SetResult(result);
   return true;
 }
 
-bool FontSettingsSetFontFunction::RunImpl() {
+bool SetFontFunction::RunImpl() {
   if (profile_->IsOffTheRecord()) {
     error_ = kSetFromIncognitoError;
     return false;
   }
 
   scoped_ptr<fonts::SetFont::Params> params(
       fonts::SetFont::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   std::string pref_path = GetFontNamePrefPath(params->details.generic_family,
                                               params->details.script);
 
   // Ensure |pref_path| really is for a registered font pref.
   EXTENSION_FUNCTION_VALIDATE(
       profile_->GetPrefs()->FindPreference(pref_path.c_str()));
 
   ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(profile_)->
       extension_service()->extension_prefs();
   prefs->SetExtensionControlledPref(
       extension_id(),
       pref_path.c_str(),
       kExtensionPrefsScopeRegular,
       Value::CreateStringValue(params->details.font_id));
   return true;
 }
 
-bool FontSettingsGetFontListFunction::RunImpl() {
+bool GetFontListFunction::RunImpl() {
   content::GetFontListAsync(
-      Bind(&FontSettingsGetFontListFunction::FontListHasLoaded, this));
+      Bind(&GetFontListFunction::FontListHasLoaded, this));
   return true;
 }
 
-void FontSettingsGetFontListFunction::FontListHasLoaded(
-    scoped_ptr<ListValue> list) {
+void GetFontListFunction::FontListHasLoaded(scoped_ptr<ListValue> list) {
   bool success = CopyFontsToResult(list.get());
   SendResponse(success);
 }
 
-bool FontSettingsGetFontListFunction::CopyFontsToResult(ListValue* fonts) {
+bool GetFontListFunction::CopyFontsToResult(ListValue* fonts) {
   scoped_ptr<ListValue> result(new ListValue());
   for (ListValue::iterator it = fonts->begin(); it != fonts->end(); ++it) {
     ListValue* font_list_value;
     if (!(*it)->GetAsList(&font_list_value)) {
       NOTREACHED();
       return false;
     }
 
     std::string name;
     if (!font_list_value->GetString(0, &name)) {
@@ skipping 67 matching lines @@
 
   ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(profile_)->
       extension_service()->extension_prefs();
   prefs->SetExtensionControlledPref(extension_id(),
                                     GetPrefName(),
                                     kExtensionPrefsScopeRegular,
                                     value->DeepCopy());
   return true;
 }
 
-const char* FontSettingsClearDefaultFontSizeFunction::GetPrefName() {
+const char* ClearDefaultFontSizeFunction::GetPrefName() {
   return prefs::kWebKitDefaultFontSize;
 }
 
-const char* FontSettingsGetDefaultFontSizeFunction::GetPrefName() {
+const char* GetDefaultFontSizeFunction::GetPrefName() {
   return prefs::kWebKitDefaultFontSize;
 }
 
-const char* FontSettingsGetDefaultFontSizeFunction::GetKey() {
+const char* GetDefaultFontSizeFunction::GetKey() {
   return kPixelSizeKey;
 }
 
-const char* FontSettingsSetDefaultFontSizeFunction::GetPrefName() {
+const char* SetDefaultFontSizeFunction::GetPrefName() {
   return prefs::kWebKitDefaultFontSize;
 }
 
-const char* FontSettingsSetDefaultFontSizeFunction::GetKey() {
+const char* SetDefaultFontSizeFunction::GetKey() {
   return kPixelSizeKey;
 }
 
-const char* FontSettingsClearDefaultFixedFontSizeFunction::GetPrefName() {
+const char* ClearDefaultFixedFontSizeFunction::GetPrefName() {
   return prefs::kWebKitDefaultFixedFontSize;
 }
 
-const char* FontSettingsGetDefaultFixedFontSizeFunction::GetPrefName() {
+const char* GetDefaultFixedFontSizeFunction::GetPrefName() {
   return prefs::kWebKitDefaultFixedFontSize;
 }
 
-const char* FontSettingsGetDefaultFixedFontSizeFunction::GetKey() {
+const char* GetDefaultFixedFontSizeFunction::GetKey() {
   return kPixelSizeKey;
 }
 
-const char* FontSettingsSetDefaultFixedFontSizeFunction::GetPrefName() {
+const char* SetDefaultFixedFontSizeFunction::GetPrefName() {
   return prefs::kWebKitDefaultFixedFontSize;
 }
 
-const char* FontSettingsSetDefaultFixedFontSizeFunction::GetKey() {
+const char* SetDefaultFixedFontSizeFunction::GetKey() {
   return kPixelSizeKey;
 }
 
-const char* FontSettingsClearMinimumFontSizeFunction::GetPrefName() {
+const char* ClearMinimumFontSizeFunction::GetPrefName() {
   return prefs::kWebKitMinimumFontSize;
 }
 
-const char* FontSettingsGetMinimumFontSizeFunction::GetPrefName() {
+const char* GetMinimumFontSizeFunction::GetPrefName() {
   return prefs::kWebKitMinimumFontSize;
 }
 
-const char* FontSettingsGetMinimumFontSizeFunction::GetKey() {
+const char* GetMinimumFontSizeFunction::GetKey() {
   return kPixelSizeKey;
 }
 
-const char* FontSettingsSetMinimumFontSizeFunction::GetPrefName() {
+const char* SetMinimumFontSizeFunction::GetPrefName() {
   return prefs::kWebKitMinimumFontSize;
 }
 
-const char* FontSettingsSetMinimumFontSizeFunction::GetKey() {
+const char* SetMinimumFontSizeFunction::GetKey() {
   return kPixelSizeKey;
 }
 
 }  // namespace extensions