Revert 173315

> gfx: The destructor of DisplayObserver does not need to be out-of-line.
> 
> Just inline it in the header file is fine as we do already for many of our
> Delegates/Observers/Listeners.
> 
> R=sky@chromium.org
> 
> Review URL: https://codereview.chromium.org/11551004

TBR=tfarina@chromium.org
Review URL: https://codereview.chromium.org/11590003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173326 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 14 insertions, 1 deletions

diff --git a/ui/gfx/display_observer.cc b/ui/gfx/display_observer.cc
new file mode 100644
index 0000000..f8e3c07
--- /dev/null
+++ b/ui/gfx/display_observer.cc
@@ -0,0 +1,12 @@
+// 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.
+
+#include "ui/gfx/display_observer.h"
+
+namespace gfx {
+
+DisplayObserver::~DisplayObserver() {
+}
+
+}  // namespace gfx
diff --git a/ui/gfx/display_observer.h b/ui/gfx/display_observer.h
index c65f95d..85a4086 100644
--- a/ui/gfx/display_observer.h
+++ b/ui/gfx/display_observer.h
@@ -25,7 +25,7 @@ class UI_EXPORT DisplayObserver {
   virtual void OnDisplayRemoved(const Display& old_display) = 0;
 
  protected:
-  virtual ~DisplayObserver() {}
+  virtual ~DisplayObserver();
 };
 
 }  // namespace gfx
diff --git a/ui/ui.gyp b/ui/ui.gyp
index c06125c..d173184 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -377,6 +377,7 @@
         'gfx/color_utils.h',
         'gfx/display.cc',
         'gfx/display.h',
+        'gfx/display_observer.cc',
         'gfx/display_observer.h',
         'gfx/favicon_size.cc',
         'gfx/favicon_size.h',