diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 18:32:45 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 18:32:45 +0000 |
| commit | 68a2afd483d452a4a676826ac257a3c412b18a20 (patch) | |
| tree | 9f86a8e61f6c8b4ed95f8349fd66d44957c15b00 /ash/desktop_background | |
| parent | 26890b442da49b02820b1ddedd934fba9cfc0eef (diff) | |
| download | chromium_src-68a2afd483d452a4a676826ac257a3c412b18a20.zip chromium_src-68a2afd483d452a4a676826ac257a3c412b18a20.tar.gz chromium_src-68a2afd483d452a4a676826ac257a3c412b18a20.tar.bz2 | |
Eliminate linker warnings
- Don't use window_property.h in header. It'll generate duplicated symbols
- Define and export property type for bool and
ui::WindowShowState in ash as they're also used by
properties defined in ash.
BUG=144155
TEST=no warning
Review URL: https://chromiumcodereview.appspot.com/11313022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164946 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/desktop_background')
| -rw-r--r-- | ash/desktop_background/desktop_background_widget_controller.cc | 1 | ||||
| -rw-r--r-- | ash/desktop_background/desktop_background_widget_controller.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ash/desktop_background/desktop_background_widget_controller.cc b/ash/desktop_background/desktop_background_widget_controller.cc index f91ee3a..530dc0e 100644 --- a/ash/desktop_background/desktop_background_widget_controller.cc +++ b/ash/desktop_background/desktop_background_widget_controller.cc @@ -6,6 +6,7 @@ #include "ash/ash_export.h" #include "ui/aura/root_window.h" +#include "ui/aura/window_property.h" #include "ui/views/widget/widget.h" // Exported for tests. diff --git a/ash/desktop_background/desktop_background_widget_controller.h b/ash/desktop_background/desktop_background_widget_controller.h index 272b3ce..27defa9 100644 --- a/ash/desktop_background/desktop_background_widget_controller.h +++ b/ash/desktop_background/desktop_background_widget_controller.h @@ -7,7 +7,7 @@ #include "ash/ash_export.h" #include "base/memory/scoped_ptr.h" -#include "ui/aura/window_property.h" +#include "ui/aura/window.h" #include "ui/compositor/layer.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_observer.h" |