Skip to content

GitLab

T
tangled
Commit 2c89665e authored by oshima@chromium.org's avatar oshima@chromium.org
Browse files
Options

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

Reason: My TODO was wrong. export.h should stay in athena/.

> 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

TBR=tfarina@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282394 0039d316-1c4b-4281-b951-d872f2087c98
parent a97737c7
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 26 deletions
athena/activity/public/DEPS
View file @ 2c89665e
include_rules = [ include_rules = [
"-athena/activity", "-athena/activity",
"+athena/common/athena_export.h", "+athena/athena_export.h",
] ]
athena/activity/public/activity.h
View file @ 2c89665e
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <string> #include <string>
#include "athena/common/athena_export.h" #include "athena/athena_export.h"
namespace athena { namespace athena {
......
athena/activity/public/activity_factory.h
View file @ 2c89665e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_FACTORY_H_ #ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_FACTORY_H_
#define 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" #include "url/gurl.h"
namespace apps { namespace apps {
......
athena/activity/public/activity_manager.h
View file @ 2c89665e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_MANAGER_H_ #ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_MANAGER_H_
#define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_MANAGER_H_ #define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_MANAGER_H_
#include "athena/common/athena_export.h" #include "athena/athena_export.h"
namespace athena { namespace athena {
......
athena/activity/public/activity_view_manager.h
View file @ 2c89665e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MANAGER_H_ #ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MANAGER_H_
#define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MANAGER_H_ #define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MANAGER_H_
#include "athena/common/athena_export.h" #include "athena/athena_export.h"
namespace athena { namespace athena {
......
athena/activity/public/activity_view_model.h
View file @ 2c89665e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MODEL_H_ #ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MODEL_H_
#define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MODEL_H_ #define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MODEL_H_
#include "athena/common/athena_export.h" #include "athena/athena_export.h"
#include "base/strings/string16.h" #include "base/strings/string16.h"
typedef unsigned int SkColor; typedef unsigned int SkColor;
......
athena/athena.gyp
View file @ 2c89665e
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
'activity/public/activity_manager.h', 'activity/public/activity_manager.h',
'activity/public/activity_view_manager.h', 'activity/public/activity_view_manager.h',
'activity/public/activity_view_model.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.cc',
'common/fill_layout_manager.h', 'common/fill_layout_manager.h',
'common/switches.cc', 'common/switches.cc',
......
athena/common/athena_export.h → athena/athena_export.h
View file @ 2c89665e
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef ATHENA_COMMON_ATHENA_EXPORT_H_ #ifndef ATHENA_ATHENA_EXPORT_H_
#define ATHENA_COMMON_ATHENA_EXPORT_H_ #define ATHENA_ATHENA_EXPORT_H_
// Defines ATHENA_EXPORT so that functionality implemented by the ATHENA module // Defines ATHENA_EXPORT so that functionality implemented by the ATHENA module
// can be exported to consumers. // can be exported to consumers.
...@@ -29,4 +29,4 @@ ...@@ -29,4 +29,4 @@
#define ATHENA_EXPORT #define ATHENA_EXPORT
#endif #endif
#endif // ATHENA_COMMON_ATHENA_EXPORT_H_ #endif // ATHENA_ATHENA_EXPORT_H_
athena/common/DEPS
View file @ 2c89665e
include_rules = [ include_rules = [
"+athena/athena_export.h",
"+ui/aura", "+ui/aura",
] ]
athena/common/fill_layout_manager.h
View file @ 2c89665e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef ATHENA_COMMON_FILL_LAYOUT_MANAGER_H_ #ifndef ATHENA_COMMON_FILL_LAYOUT_MANAGER_H_
#define ATHENA_COMMON_FILL_LAYOUT_MANAGER_H_ #define ATHENA_COMMON_FILL_LAYOUT_MANAGER_H_
#include "athena/common/athena_export.h" #include "athena/athena_export.h"
#include "ui/aura/layout_manager.h" #include "ui/aura/layout_manager.h"
namespace athena { namespace athena {
......
athena/content/public/DEPS
View file @ 2c89665e
include_rules = [ include_rules = [
"-athena/content", "-athena/content",
"+athena/common/athena_export.h", "+athena/athena_export.h",
] ]
athena/content/public/content_activity_factory.h
View file @ 2c89665e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#define ATHENA_CONTENT_PUBLIC_CONTENT_ACTIVITY_FACTORY_H_ #define ATHENA_CONTENT_PUBLIC_CONTENT_ACTIVITY_FACTORY_H_
#include "athena/activity/public/activity_factory.h" #include "athena/activity/public/activity_factory.h"
#include "athena/common/athena_export.h" #include "athena/athena_export.h"
#include "base/macros.h" #include "base/macros.h"
namespace athena { namespace athena {
......
athena/home/public/DEPS
View file @ 2c89665e
include_rules = [ include_rules = [
"-athena/home", "-athena/home",
"+athena/common/athena_export.h", "+athena/athena_export.h",
] ]
athena/home/public/app_model_builder.h
View file @ 2c89665e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef ATHENA_HOME_PUBLIC_APP_MODEL_BUILDER_H_ #ifndef ATHENA_HOME_PUBLIC_APP_MODEL_BUILDER_H_
#define ATHENA_HOME_PUBLIC_APP_MODEL_BUILDER_H_ #define ATHENA_HOME_PUBLIC_APP_MODEL_BUILDER_H_
#include "athena/common/athena_export.h" #include "athena/athena_export.h"
namespace app_list { namespace app_list {
class AppListModel; class AppListModel;
......
athena/home/public/home_card.h
View file @ 2c89665e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef ATHENA_HOME_PUBLIC_HOME_CARD_H_ #ifndef ATHENA_HOME_PUBLIC_HOME_CARD_H_
#define ATHENA_HOME_PUBLIC_HOME_CARD_H_ #define ATHENA_HOME_PUBLIC_HOME_CARD_H_
#include "athena/common/athena_export.h" #include "athena/athena_export.h"
namespace app_list { namespace app_list {
class SearchProvider; class SearchProvider;
......
athena/input/public/DEPS
View file @ 2c89665e
include_rules = [ include_rules = [
"-athena/input", "-athena/input",
"+athena/common/athena_export.h", "+athena/athena_export.h",
] ]
athena/input/public/accelerator_manager.h
View file @ 2c89665e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef ATHENA_INPUT_PUBLIC_ACCELERATOR_MANAGER_H_ #ifndef ATHENA_INPUT_PUBLIC_ACCELERATOR_MANAGER_H_
#define ATHENA_INPUT_PUBLIC_ACCELERATOR_MANAGER_H_ #define ATHENA_INPUT_PUBLIC_ACCELERATOR_MANAGER_H_
#include "athena/common/athena_export.h" #include "athena/athena_export.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "ui/events/keycodes/keyboard_codes.h" #include "ui/events/keycodes/keyboard_codes.h"
......
athena/input/public/input_manager.h
View file @ 2c89665e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef ATHENA_INPUT_PUBLIC_INPUT_MANAGER_H_ #ifndef ATHENA_INPUT_PUBLIC_INPUT_MANAGER_H_
#define ATHENA_INPUT_PUBLIC_INPUT_MANAGER_H_ #define ATHENA_INPUT_PUBLIC_INPUT_MANAGER_H_
#include "athena/common/athena_export.h" #include "athena/athena_export.h"
namespace aura { namespace aura {
class Window; class Window;
......
athena/screen/public/DEPS
View file @ 2c89665e
include_rules = [ include_rules = [
"-athena/screen", "-athena/screen",
"+athena/common/athena_export.h", "+athena/athena_export.h",
] ]
athena/screen/public/screen_manager.h
View file @ 2c89665e
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <string> #include <string>
#include "athena/common/athena_export.h" #include "athena/athena_export.h"
namespace aura { namespace aura {
class Window; class Window;
......
athena/virtual_keyboard/public/DEPS
View file @ 2c89665e
include_rules = [ include_rules = [
"+athena/common/athena_export.h", "+athena/athena_export.h",
"-athena/virtual_keyboard", "-athena/virtual_keyboard",
] ]
athena/virtual_keyboard/public/virtual_keyboard_bindings.h
View file @ 2c89665e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef ATHENA_VIRTUAL_KEYBOARD_PUBLIC_VIRTUAL_KEYBOARD_BINDINGS_H_ #ifndef ATHENA_VIRTUAL_KEYBOARD_PUBLIC_VIRTUAL_KEYBOARD_BINDINGS_H_
#define ATHENA_VIRTUAL_KEYBOARD_PUBLIC_VIRTUAL_KEYBOARD_BINDINGS_H_ #define ATHENA_VIRTUAL_KEYBOARD_PUBLIC_VIRTUAL_KEYBOARD_BINDINGS_H_
#include "athena/common/athena_export.h" #include "athena/athena_export.h"
namespace content { namespace content {
class RenderView; class RenderView;
......
athena/virtual_keyboard/public/virtual_keyboard_manager.h
View file @ 2c89665e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef ATHENA_VIRTUAL_KEYBOARD_PUBLIC_VIRTUAL_KEYBOARD_MANAGER_H_ #ifndef ATHENA_VIRTUAL_KEYBOARD_PUBLIC_VIRTUAL_KEYBOARD_MANAGER_H_
#define ATHENA_VIRTUAL_KEYBOARD_PUBLIC_VIRTUAL_KEYBOARD_MANAGER_H_ #define ATHENA_VIRTUAL_KEYBOARD_PUBLIC_VIRTUAL_KEYBOARD_MANAGER_H_
#include "athena/common/athena_export.h" #include "athena/athena_export.h"
namespace aura { namespace aura {
class Window; class Window;
......
athena/wm/public/DEPS
View file @ 2c89665e
include_rules = [ include_rules = [
"-athena/wm", "-athena/wm",
"+athena/common/athena_export.h", "+athena/athena_export.h",
] ]
athena/wm/public/window_manager.h
View file @ 2c89665e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef ATHENA_SCREEN_PUBLIC_WINDOW_MANAGER_H_ #ifndef ATHENA_SCREEN_PUBLIC_WINDOW_MANAGER_H_
#define ATHENA_SCREEN_PUBLIC_WINDOW_MANAGER_H_ #define ATHENA_SCREEN_PUBLIC_WINDOW_MANAGER_H_
#include "athena/common/athena_export.h" #include "athena/athena_export.h"
namespace athena { namespace athena {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment