Revert 282159 "athena: Move athena_export.h into common/ directory."

trunk/src/athena/athena.gyp

 # Copyright 2014 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 14 matching lines @@
         # All .cc, .h under athena, except unittests
         'activity/activity.cc',
         'activity/activity_factory.cc',
         'activity/activity_manager_impl.cc',
         'activity/activity_view_manager_impl.cc',
         'activity/public/activity.h',
         'activity/public/activity_factory.h',
         'activity/public/activity_manager.h',
         'activity/public/activity_view_manager.h',
         'activity/public/activity_view_model.h',
-        'common/athena_export.h',
+        # move athena_export.h to common/
+        'athena_export.h',
         'common/fill_layout_manager.cc',
         'common/fill_layout_manager.h',
         'common/switches.cc',
         'common/switches.h',
         'home/app_list_view_delegate.cc',
         'home/app_list_view_delegate.h',
         'home/home_card_impl.cc',
         'home/public/app_model_builder.h',
         'home/public/home_card.h',
         'input/accelerator_manager_impl.cc',
@@ skipping 95 matching lines @@
       'sources': [
         'test/athena_unittests.cc',
         'activity/activity_manager_unittest.cc',
         'input/accelerator_manager_unittest.cc',
         'wm/window_manager_unittest.cc',
       ],
     }
   ],
 }