ash::LauncherItem doesn't compile under clang

Removes inline methods from ash::LaucherItem that cause trouble
when compiling under clang with Chromium style plugins.

BUG=109946
TEST=Compiles under clang
R=sky@chromium.org


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

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

3 files changed, 31 insertions, 6 deletions

diff --git a/ash/ash.gyp b/ash/ash.gyp
index 32d9cbb..a2f6a33 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -77,6 +77,7 @@
         'launcher/launcher_model.cc',
         'launcher/launcher_model.h',
         'launcher/launcher_model_observer.h',
+        'launcher/launcher_types.cc',
         'launcher/launcher_types.h',
         'launcher/launcher_view.cc',
         'launcher/launcher_view.h',
diff --git a/ash/launcher/launcher_types.cc b/ash/launcher/launcher_types.cc
new file mode 100644
index 0000000..ca6e932
--- /dev/null
+++ b/ash/launcher/launcher_types.cc
@@ -0,0 +1,26 @@
+// 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 "ash/launcher/launcher_types.h"
+
+namespace ash {
+
+LauncherItem::LauncherItem()
+    : type(TYPE_TABBED),
+      window(NULL),
+      user_data(NULL) {
+}
+
+LauncherItem::LauncherItem(LauncherItemType type,
+                           aura::Window* window,
+                           void* user_data)
+    : type(type),
+      window(window),
+      user_data(user_data) {
+}
+
+LauncherItem::~LauncherItem() {
+}
+
+}  // namespace ash
diff --git a/ash/launcher/launcher_types.h b/ash/launcher/launcher_types.h
index 664694a..93c7876 100644
--- a/ash/launcher/launcher_types.h
+++ b/ash/launcher/launcher_types.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -41,13 +41,11 @@ struct ASH_EXPORT LauncherTabbedImage {
 typedef std::vector<LauncherTabbedImage> LauncherTabbedImages;
 
 struct ASH_EXPORT LauncherItem {
-  LauncherItem() : type(TYPE_TABBED), window(NULL), user_data(NULL) {}
+  LauncherItem();
   LauncherItem(LauncherItemType type,
                aura::Window* window,
-               void* user_data)
-      : type(type),
-        window(window),
-        user_data(user_data) {}
+               void* user_data);
+  ~LauncherItem();
 
   LauncherItemType type;
   aura::Window* window;