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

trunk/src/athena/activity/public/activity_factory.h

 // 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.
 
 #ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_FACTORY_H_
 #define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_FACTORY_H_
 
-#include "athena/common/athena_export.h"
+#include "athena/athena_export.h"
 #include "url/gurl.h"
 
 namespace apps {
 class ShellAppWindow;
 }
 
 namespace content {
 class BrowserContext;
 }
 
@@ skipping 18 matching lines @@
                                       const GURL& url) = 0;
 
   // Create an activity of an app with |app_window|. The returned activity
   // should own |app_window|.
   virtual Activity* CreateAppActivity(apps::ShellAppWindow* app_window) = 0;
 };
 
 }  // namespace athena
 
 #endif  // ATHENA_ACTIVITY_PUBLIC_ACTIVITY_FACTORY_H_