diff options
| author | chirantan <chirantan@chromium.org> | 2014-12-19 14:50:07 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-19 22:51:12 +0000 |
| commit | 933d4da4fb425cb57480445f21c66bcfb95dcebe (patch) | |
| tree | d82ba3987894db9b08d833aa37166fa4de8c79b5 /ash | |
| parent | 01e8a198329f30b6bcbb81dc9daade61435ef297 (diff) | |
| download | chromium_src-933d4da4fb425cb57480445f21c66bcfb95dcebe.zip chromium_src-933d4da4fb425cb57480445f21c66bcfb95dcebe.tar.gz chromium_src-933d4da4fb425cb57480445f21c66bcfb95dcebe.tar.bz2 | |
Revert of Use template specialization to generate WindowProperty code (patchset #8 id:330001 of https://codereview.chromium.org/801953002/)
Reason for revert:
This is breaking chrome on chrome os builds:
In file included from ../../ui/aura/client/screen_position_client.cc:7:0:
../../ui/aura/window_property.h:115:58: error: specialization of 'template<class T> void aura::Window::SetProperty(const aura::WindowProperty<T>*, T)' in different namespace [-fpermissive]
const aura::WindowProperty<T >* property, T value) { \
^
../../ui/aura/window_property.h:127:5: note: in expansion of macro 'DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE'
DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(, T)
^
../../ui/aura/client/screen_position_client.cc:9:1: note: in expansion of macro 'DECLARE_WINDOW_PROPERTY_TYPE'
DECLARE_WINDOW_PROPERTY_TYPE(aura::client::ScreenPositionClient*)
^
In file included from ../../ui/aura/client/screen_position_client.h:9:0,
from ../../ui/aura/client/screen_position_client.cc:5:
../../ui/aura/window.h:297:8: error: from definition of 'template<class T> void aura::Window::SetProperty(const aura::WindowProperty<T>*, T)' [-fpermissive]
void SetProperty(const WindowProperty<T>* property, T value);
^
Original issue's description:
> Use template specialization to generate WindowProperty code.
>
> They used to be a inlined function in the header, which led to code generation when method is used. This changes the code generation only in DECLARE_WINDOW_PROPERTY_TYPE().
>
> BUG=None
> R=sadrul@chromium.org
>
> Committed: https://crrev.com/f62e152bb7a13135a597d9766eb79551d3a24a73
> Cr-Commit-Position: refs/heads/master@{#309252}
TBR=sadrul@chromium.org,sky@chromium.org,oshima@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=None
Seems like nobody is around. LGTM. I'm broken by this as well.
Review URL: https://codereview.chromium.org/814313002
Cr-Commit-Position: refs/heads/master@{#309285}
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shelf/shelf_util.cc | 1 | ||||
| -rw-r--r-- | ash/touch/touch_uma.cc | 2 | ||||
| -rw-r--r-- | ash/wm/system_modal_container_layout_manager.cc | 2 | ||||
| -rw-r--r-- | ash/wm/window_properties.cc | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/ash/shelf/shelf_util.cc b/ash/shelf/shelf_util.cc index 70fa02b..f5e2658 100644 --- a/ash/shelf/shelf_util.cc +++ b/ash/shelf/shelf_util.cc @@ -7,6 +7,7 @@ #include "ash/shelf/shelf_constants.h" #include "ui/aura/window_property.h" +DECLARE_WINDOW_PROPERTY_TYPE(ash::ShelfID); DECLARE_WINDOW_PROPERTY_TYPE(ash::ShelfItemDetails*); namespace ash { diff --git a/ash/touch/touch_uma.cc b/ash/touch/touch_uma.cc index de0f399..04948d2 100644 --- a/ash/touch/touch_uma.cc +++ b/ash/touch/touch_uma.cc @@ -46,8 +46,6 @@ DEFINE_OWNED_WINDOW_PROPERTY_KEY(WindowTouchDetails, NULL); } -DECLARE_WINDOW_PROPERTY_TYPE(WindowTouchDetails*); - namespace ash { // static diff --git a/ash/wm/system_modal_container_layout_manager.cc b/ash/wm/system_modal_container_layout_manager.cc index 9268458..85916d8 100644 --- a/ash/wm/system_modal_container_layout_manager.cc +++ b/ash/wm/system_modal_container_layout_manager.cc @@ -30,6 +30,8 @@ #include "ui/views/widget/widget.h" #include "ui/wm/core/compound_event_filter.h" +DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, bool); + namespace ash { // If this is set to true, the window will get centered. diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc index f7c8b56..d071a5f 100644 --- a/ash/wm/window_properties.cc +++ b/ash/wm/window_properties.cc @@ -8,6 +8,8 @@ #include "ui/aura/window_property.h" DECLARE_WINDOW_PROPERTY_TYPE(ash::wm::WindowState*); +DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, gfx::Rect*) +DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ui::WindowShowState) namespace ash { |