diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-23 23:35:31 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-23 23:35:31 +0000 |
| commit | b65bdda36c548cd680eecbbfcfbd482b740e2eb3 (patch) | |
| tree | f904be7f7f8db20269dbe2c76b28e325ec04bd28 /ash/tooltips | |
| parent | ff00968f75fd1a82532b0009f535310db5a9556c (diff) | |
| download | chromium_src-b65bdda36c548cd680eecbbfcfbd482b740e2eb3.zip chromium_src-b65bdda36c548cd680eecbbfcfbd482b740e2eb3.tar.gz chromium_src-b65bdda36c548cd680eecbbfcfbd482b740e2eb3.tar.bz2 | |
Move last few files -> ash
http://crbug.com/108457
TEST=none
TBR=sky
Review URL: http://codereview.chromium.org/9036011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/tooltips')
| -rw-r--r-- | ash/tooltips/tooltip_controller.cc | 4 | ||||
| -rw-r--r-- | ash/tooltips/tooltip_controller.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc index 20e1097..661d04c 100644 --- a/ash/tooltips/tooltip_controller.cc +++ b/ash/tooltips/tooltip_controller.cc @@ -6,14 +6,14 @@ #include <vector> +#include "ash/ash_switches.h" +#include "ash/shell.h" #include "base/command_line.h" #include "base/location.h" #include "base/string_split.h" #include "base/time.h" -#include "ui/aura_shell/aura_shell_switches.h" #include "ui/aura/event.h" #include "ui/aura/window.h" -#include "ui/aura_shell/shell.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" #include "ui/gfx/font.h" diff --git a/ash/tooltips/tooltip_controller.h b/ash/tooltips/tooltip_controller.h index 41daaa22..5ab55d64 100644 --- a/ash/tooltips/tooltip_controller.h +++ b/ash/tooltips/tooltip_controller.h @@ -12,7 +12,7 @@ #include "ui/aura/client/tooltip_client.h" #include "ui/aura/event_filter.h" #include "ui/aura/window_observer.h" -#include "ui/aura_shell/aura_shell_export.h" +#include "ash/ash_export.h" #include "ui/gfx/point.h" namespace aura { @@ -31,7 +31,7 @@ class TooltipControllerTest; namespace internal { // TooltipController provides tooltip functionality for aura shell. -class AURA_SHELL_EXPORT TooltipController : public aura::client::TooltipClient, +class ASH_EXPORT TooltipController : public aura::client::TooltipClient, public aura::EventFilter, public aura::WindowObserver { public: |