athena: Move athena_export.h into common/ directory.

Fix a TODO in athena.gyp.

BUG=None
TEST=None
R=oshima@chromium.org

Review URL: https://codereview.chromium.org/371573002

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

25 files changed, 26 insertions, 28 deletions

diff --git a/athena/activity/public/DEPS b/athena/activity/public/DEPS
index e48a494..67374ac 100644
--- a/athena/activity/public/DEPS
+++ b/athena/activity/public/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
   "-athena/activity",
-  "+athena/athena_export.h",
+  "+athena/common/athena_export.h",
 ]
diff --git a/athena/activity/public/activity.h b/athena/activity/public/activity.h
index 600182f..dd5f248 100644
--- a/athena/activity/public/activity.h
+++ b/athena/activity/public/activity.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "athena/athena_export.h"
+#include "athena/common/athena_export.h"
 
 namespace athena {
 
diff --git a/athena/activity/public/activity_factory.h b/athena/activity/public/activity_factory.h
index bc95893..52e5b42 100644
--- a/athena/activity/public/activity_factory.h
+++ b/athena/activity/public/activity_factory.h
@@ -5,7 +5,7 @@
 #ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_FACTORY_H_
 #define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_FACTORY_H_
 
-#include "athena/athena_export.h"
+#include "athena/common/athena_export.h"
 #include "url/gurl.h"
 
 namespace apps {
diff --git a/athena/activity/public/activity_manager.h b/athena/activity/public/activity_manager.h
index eec59ca..1b7dbea 100644
--- a/athena/activity/public/activity_manager.h
+++ b/athena/activity/public/activity_manager.h
@@ -5,7 +5,7 @@
 #ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_MANAGER_H_
 #define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_MANAGER_H_
 
-#include "athena/athena_export.h"
+#include "athena/common/athena_export.h"
 
 namespace athena {
 
diff --git a/athena/activity/public/activity_view_manager.h b/athena/activity/public/activity_view_manager.h
index 6ca8b31..6fb2991 100644
--- a/athena/activity/public/activity_view_manager.h
+++ b/athena/activity/public/activity_view_manager.h
@@ -5,7 +5,7 @@
 #ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MANAGER_H_
 #define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MANAGER_H_
 
-#include "athena/athena_export.h"
+#include "athena/common/athena_export.h"
 
 namespace athena {
 
diff --git a/athena/activity/public/activity_view_model.h b/athena/activity/public/activity_view_model.h
index 5e6614c..e0049bc 100644
--- a/athena/activity/public/activity_view_model.h
+++ b/athena/activity/public/activity_view_model.h
@@ -5,7 +5,7 @@
 #ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MODEL_H_
 #define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MODEL_H_
 
-#include "athena/athena_export.h"
+#include "athena/common/athena_export.h"
 #include "base/strings/string16.h"
 
 typedef unsigned int SkColor;
diff --git a/athena/athena.gyp b/athena/athena.gyp
index c9fd97c..619855b 100644
--- a/athena/athena.gyp
+++ b/athena/athena.gyp
@@ -32,8 +32,7 @@
         'activity/public/activity_manager.h',
         'activity/public/activity_view_manager.h',
         'activity/public/activity_view_model.h',
-        # move athena_export.h to common/
-        'athena_export.h',
+        'common/athena_export.h',
         'common/fill_layout_manager.cc',
         'common/fill_layout_manager.h',
         'common/switches.cc',
diff --git a/athena/common/DEPS b/athena/common/DEPS
index 716fe60..a736dac 100644
--- a/athena/common/DEPS
+++ b/athena/common/DEPS
@@ -1,4 +1,3 @@
 include_rules = [
-  "+athena/athena_export.h",
   "+ui/aura",
 ]
diff --git a/athena/athena_export.h b/athena/common/athena_export.h
index 7abb1fa..77059ee 100644
--- a/athena/athena_export.h
+++ b/athena/common/athena_export.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATHENA_ATHENA_EXPORT_H_
-#define ATHENA_ATHENA_EXPORT_H_
+#ifndef ATHENA_COMMON_ATHENA_EXPORT_H_
+#define ATHENA_COMMON_ATHENA_EXPORT_H_
 
 // Defines ATHENA_EXPORT so that functionality implemented by the ATHENA module
 // can be exported to consumers.
@@ -29,4 +29,4 @@
 #define ATHENA_EXPORT
 #endif
 
-#endif  // ATHENA_ATHENA_EXPORT_H_
+#endif  // ATHENA_COMMON_ATHENA_EXPORT_H_
diff --git a/athena/common/fill_layout_manager.h b/athena/common/fill_layout_manager.h
index a5df2d4..f9d2406 100644
--- a/athena/common/fill_layout_manager.h
+++ b/athena/common/fill_layout_manager.h
@@ -5,7 +5,7 @@
 #ifndef ATHENA_COMMON_FILL_LAYOUT_MANAGER_H_
 #define ATHENA_COMMON_FILL_LAYOUT_MANAGER_H_
 
-#include "athena/athena_export.h"
+#include "athena/common/athena_export.h"
 #include "ui/aura/layout_manager.h"
 
 namespace athena {
diff --git a/athena/content/public/DEPS b/athena/content/public/DEPS
index 27d5887..4ea1a25 100644
--- a/athena/content/public/DEPS
+++ b/athena/content/public/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
   "-athena/content",
-  "+athena/athena_export.h",
+  "+athena/common/athena_export.h",
 ]
diff --git a/athena/content/public/content_activity_factory.h b/athena/content/public/content_activity_factory.h
index 2698123..d577e4a 100644
--- a/athena/content/public/content_activity_factory.h
+++ b/athena/content/public/content_activity_factory.h
@@ -6,7 +6,7 @@
 #define ATHENA_CONTENT_PUBLIC_CONTENT_ACTIVITY_FACTORY_H_
 
 #include "athena/activity/public/activity_factory.h"
-#include "athena/athena_export.h"
+#include "athena/common/athena_export.h"
 #include "base/macros.h"
 
 namespace athena {
diff --git a/athena/home/public/DEPS b/athena/home/public/DEPS
index e063e7b..6a79ee5 100644
--- a/athena/home/public/DEPS
+++ b/athena/home/public/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
   "-athena/home",
-  "+athena/athena_export.h",
+  "+athena/common/athena_export.h",
 ]
diff --git a/athena/home/public/app_model_builder.h b/athena/home/public/app_model_builder.h
index 5cfa890..23da1e8 100644
--- a/athena/home/public/app_model_builder.h
+++ b/athena/home/public/app_model_builder.h
@@ -5,7 +5,7 @@
 #ifndef ATHENA_HOME_PUBLIC_APP_MODEL_BUILDER_H_
 #define ATHENA_HOME_PUBLIC_APP_MODEL_BUILDER_H_
 
-#include "athena/athena_export.h"
+#include "athena/common/athena_export.h"
 
 namespace app_list {
 class AppListModel;
diff --git a/athena/home/public/home_card.h b/athena/home/public/home_card.h
index 3bc43ba..1dcf214 100644
--- a/athena/home/public/home_card.h
+++ b/athena/home/public/home_card.h
@@ -5,7 +5,7 @@
 #ifndef ATHENA_HOME_PUBLIC_HOME_CARD_H_
 #define ATHENA_HOME_PUBLIC_HOME_CARD_H_
 
-#include "athena/athena_export.h"
+#include "athena/common/athena_export.h"
 
 namespace app_list {
 class SearchProvider;
diff --git a/athena/input/public/DEPS b/athena/input/public/DEPS
index 941cfac..3c17815 100644
--- a/athena/input/public/DEPS
+++ b/athena/input/public/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
   "-athena/input",
-  "+athena/athena_export.h",
+  "+athena/common/athena_export.h",
 ]
diff --git a/athena/input/public/accelerator_manager.h b/athena/input/public/accelerator_manager.h
index b572c50..913eeee 100644
--- a/athena/input/public/accelerator_manager.h
+++ b/athena/input/public/accelerator_manager.h
@@ -5,7 +5,7 @@
 #ifndef ATHENA_INPUT_PUBLIC_ACCELERATOR_MANAGER_H_
 #define ATHENA_INPUT_PUBLIC_ACCELERATOR_MANAGER_H_
 
-#include "athena/athena_export.h"
+#include "athena/common/athena_export.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
diff --git a/athena/input/public/input_manager.h b/athena/input/public/input_manager.h
index cc70175..6562730 100644
--- a/athena/input/public/input_manager.h
+++ b/athena/input/public/input_manager.h
@@ -5,7 +5,7 @@
 #ifndef ATHENA_INPUT_PUBLIC_INPUT_MANAGER_H_
 #define ATHENA_INPUT_PUBLIC_INPUT_MANAGER_H_
 
-#include "athena/athena_export.h"
+#include "athena/common/athena_export.h"
 
 namespace aura {
 class Window;
diff --git a/athena/screen/public/DEPS b/athena/screen/public/DEPS
index 1053525..4842128 100644
--- a/athena/screen/public/DEPS
+++ b/athena/screen/public/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
   "-athena/screen",
-  "+athena/athena_export.h",
+  "+athena/common/athena_export.h",
 ]
diff --git a/athena/screen/public/screen_manager.h b/athena/screen/public/screen_manager.h
index c2914fe8..042b7df 100644
--- a/athena/screen/public/screen_manager.h
+++ b/athena/screen/public/screen_manager.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "athena/athena_export.h"
+#include "athena/common/athena_export.h"
 
 namespace aura {
 class Window;
diff --git a/athena/virtual_keyboard/public/DEPS b/athena/virtual_keyboard/public/DEPS
index 12385bd..9349130 100644
--- a/athena/virtual_keyboard/public/DEPS
+++ b/athena/virtual_keyboard/public/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
-  "+athena/athena_export.h",
+  "+athena/common/athena_export.h",
   "-athena/virtual_keyboard",
 ]
diff --git a/athena/virtual_keyboard/public/virtual_keyboard_bindings.h b/athena/virtual_keyboard/public/virtual_keyboard_bindings.h
index 921699f..fcd341c 100644
--- a/athena/virtual_keyboard/public/virtual_keyboard_bindings.h
+++ b/athena/virtual_keyboard/public/virtual_keyboard_bindings.h
@@ -5,7 +5,7 @@
 #ifndef ATHENA_VIRTUAL_KEYBOARD_PUBLIC_VIRTUAL_KEYBOARD_BINDINGS_H_
 #define ATHENA_VIRTUAL_KEYBOARD_PUBLIC_VIRTUAL_KEYBOARD_BINDINGS_H_
 
-#include "athena/athena_export.h"
+#include "athena/common/athena_export.h"
 
 namespace content {
 class RenderView;
diff --git a/athena/virtual_keyboard/public/virtual_keyboard_manager.h b/athena/virtual_keyboard/public/virtual_keyboard_manager.h
index 4446697..dc0c4de 100644
--- a/athena/virtual_keyboard/public/virtual_keyboard_manager.h
+++ b/athena/virtual_keyboard/public/virtual_keyboard_manager.h
@@ -5,7 +5,7 @@
 #ifndef ATHENA_VIRTUAL_KEYBOARD_PUBLIC_VIRTUAL_KEYBOARD_MANAGER_H_
 #define ATHENA_VIRTUAL_KEYBOARD_PUBLIC_VIRTUAL_KEYBOARD_MANAGER_H_
 
-#include "athena/athena_export.h"
+#include "athena/common/athena_export.h"
 
 namespace aura {
 class Window;
diff --git a/athena/wm/public/DEPS b/athena/wm/public/DEPS
index d2970da..7dd88206 100644
--- a/athena/wm/public/DEPS
+++ b/athena/wm/public/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
   "-athena/wm",
-  "+athena/athena_export.h",
+  "+athena/common/athena_export.h",
 ]
diff --git a/athena/wm/public/window_manager.h b/athena/wm/public/window_manager.h
index 9cbd79e..d82749a 100644
--- a/athena/wm/public/window_manager.h
+++ b/athena/wm/public/window_manager.h
@@ -5,7 +5,7 @@
 #ifndef ATHENA_SCREEN_PUBLIC_WINDOW_MANAGER_H_
 #define ATHENA_SCREEN_PUBLIC_WINDOW_MANAGER_H_
 
-#include "athena/athena_export.h"
+#include "athena/common/athena_export.h"
 
 namespace athena {