From 66c9e82bfe85d39a161be5f109b02c467374914e Mon Sep 17 00:00:00 2001
From: "ivankr@chromium.org"
 <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 18 Nov 2011 13:07:59 +0000
Subject: Revert 110685 - Fix Clang error on SettingChange.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/8597009

TBR=ivankr@chromium.org
Review URL: http://codereview.chromium.org/8558016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110688 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/protector/setting_change.cc | 25 -------------------------
 chrome/browser/protector/setting_change.h  | 10 +++++-----
 2 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 chrome/browser/protector/setting_change.cc

(limited to 'chrome/browser/protector')

diff --git a/chrome/browser/protector/setting_change.cc b/chrome/browser/protector/setting_change.cc
deleted file mode 100644
index 8731e4c..0000000
--- a/chrome/browser/protector/setting_change.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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/protector/setting_change.h"
-
-namespace protector {
-
-SettingChange::SettingChange() {
-}
-
-SettingChange::~SettingChange() {
-}
-
-bool SettingChange::Init(Protector* protector) {
-  return true;
-}
-
-void SettingChange::Apply(Protector* protector) {
-}
-
-void SettingChange::Discard(Protector* protector) {
-}
-
-}  // namespace protector
diff --git a/chrome/browser/protector/setting_change.h b/chrome/browser/protector/setting_change.h
index 6f6f6dc..63e4261 100644
--- a/chrome/browser/protector/setting_change.h
+++ b/chrome/browser/protector/setting_change.h
@@ -21,19 +21,19 @@ class Protector;
 // Base class for setting change tracked by Protector.
 class SettingChange {
  public:
-  SettingChange();
-  virtual ~SettingChange();
+  SettingChange() {}
+  virtual ~SettingChange() {}
 
   // Applies initial actions to the setting if needed. Must be called before
   // any other calls are made, including text getters. Returns true if
   // initialization was successful.
-  virtual bool Init(Protector* protector);
+  virtual bool Init(Protector* protector) { return true; }
 
   // Persists new setting if needed.
-  virtual void Apply(Protector* protector);
+  virtual void Apply(Protector* protector) {}
 
   // Restores old setting if needed.
-  virtual void Discard(Protector* protector);
+  virtual void Discard(Protector* protector) {}
 
   // Returns the wrench menu item and bubble title.
   virtual string16 GetTitle() const = 0;
-- 
cgit v1.1